Federico Simoncelli has uploaded a new change for review. Change subject: [wip] core: avoid RefreshStoragePool on the SPM ......................................................................
[wip] core: avoid RefreshStoragePool on the SPM Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=882958 Change-Id: I6e3b95c14c9084da6a5de9782411414553349927 Signed-off-by: Federico Simoncelli <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperation.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshPoolSingleAsyncOperation.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshStoragePoolAndDisconnectAsyncOperation.java 3 files changed, 19 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/52/10452/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperation.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperation.java index b7a803b..7323e4d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperation.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AfterDeactivateSingleAsyncOperation.java @@ -28,7 +28,7 @@ try { log.infoFormat("After deactivate treatment vds: {0},pool {1}", getVdss().get(iterationId).getvds_name(), getStoragePool().getname()); - if (!_isLastMaster) { + if (!_isLastMaster && getVdss().get(iterationId).getspm_status() != VdsSpmStatus.SPM) { Backend.getInstance() .getResourceManager() .RunVdsCommand( diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshPoolSingleAsyncOperation.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshPoolSingleAsyncOperation.java index d38dff0..18e3659 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshPoolSingleAsyncOperation.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshPoolSingleAsyncOperation.java @@ -3,10 +3,11 @@ import java.util.ArrayList; import org.ovirt.engine.core.bll.Backend; -import org.ovirt.engine.core.common.businessentities.StorageDomainType; -import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.storage_domains; +import org.ovirt.engine.core.common.businessentities.StorageDomainType; import org.ovirt.engine.core.common.businessentities.storage_pool; +import org.ovirt.engine.core.common.businessentities.VDS; +import org.ovirt.engine.core.common.businessentities.VdsSpmStatus; import org.ovirt.engine.core.common.vdscommands.ConnectStoragePoolVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.RefreshStoragePoolVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; @@ -49,15 +50,17 @@ } } } else { - Backend.getInstance() - .getResourceManager() - .RunVdsCommand( - VDSCommandType.RefreshStoragePool, - new RefreshStoragePoolVDSCommandParameters(getVdss().get(iterationId).getId(), - getStoragePool().getId(), masterDomainIdFromDb, getStoragePool() - .getmaster_domain_version())); - log.infoFormat("Refreshed vds {0} in pool {1}", getVdss().get(iterationId).getvds_name(), + if (getVdss().get(iterationId).getspm_status() != VdsSpmStatus.SPM) { + Backend.getInstance() + .getResourceManager() + .RunVdsCommand( + VDSCommandType.RefreshStoragePool, + new RefreshStoragePoolVDSCommandParameters(getVdss().get(iterationId).getId(), + getStoragePool().getId(), masterDomainIdFromDb, getStoragePool() + .getmaster_domain_version())); + log.infoFormat("Refreshed vds {0} in pool {1}", getVdss().get(iterationId).getvds_name(), getStoragePool().getname()); + } } } catch (RuntimeException e) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshStoragePoolAndDisconnectAsyncOperation.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshStoragePoolAndDisconnectAsyncOperation.java index 0fef687..b0d80cf 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshStoragePoolAndDisconnectAsyncOperation.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RefreshStoragePoolAndDisconnectAsyncOperation.java @@ -1,9 +1,10 @@ package org.ovirt.engine.core.bll.storage; import org.ovirt.engine.core.bll.Backend; -import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.businessentities.storage_pool; +import org.ovirt.engine.core.common.businessentities.VDS; +import org.ovirt.engine.core.common.businessentities.VdsSpmStatus; import org.ovirt.engine.core.common.vdscommands.RefreshStoragePoolVDSCommandParameters; import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.compat.Guid; @@ -19,6 +20,9 @@ @Override public void execute(int iterationId) { + if (getVdss().get(iterationId).getspm_status() == VdsSpmStatus.SPM) { + return; + } try { Guid masterDomainIdFromDb = DbFacade.getInstance() -- To view, visit http://gerrit.ovirt.org/10452 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6e3b95c14c9084da6a5de9782411414553349927 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
