Federico Simoncelli has uploaded a new change for review. Change subject: core: spm local in DeactivateStorageDomainCommand ......................................................................
core: spm local in DeactivateStorageDomainCommand Change-Id: I48155e8bf5649f7485dfcb80df2d3eb18949c961 Signed-off-by: Federico Simoncelli <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/41/28441/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java index a272f93..b72e515 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java @@ -56,7 +56,6 @@ protected boolean _isLastMaster; protected boolean canChooseInactiveDomainAsMaster; protected boolean canChooseCurrentMasterAsNewMaster; - private VDS spm; protected StorageDomain getNewMaster(boolean duringReconstruct) { if (_newMaster == null && Guid.Empty.equals(_newMasterStorageDomainId)) { @@ -194,10 +193,6 @@ @Override protected void executeCommand() { - spm = null; - if (getStoragePool().getspm_vds_id() != null) { - spm = getVdsDAO().get(getStoragePool().getspm_vds_id()); - } final StoragePoolIsoMap map = getStoragePoolIsoMapDAO().get (new StoragePoolIsoMapId(getParameters().getStorageDomainId(), @@ -233,6 +228,11 @@ } freeLock(); + VDS spm = null; + if (getStoragePool().getspm_vds_id() != null) { + spm = getVdsDAO().get(getStoragePool().getspm_vds_id()); + } + if (_isLastMaster) { if (spm != null) { final VDSReturnValue stopSpmReturnValue = runVdsCommand(VDSCommandType.SpmStopOnIrs, -- To view, visit http://gerrit.ovirt.org/28441 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I48155e8bf5649f7485dfcb80df2d3eb18949c961 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
