Federico Simoncelli has uploaded a new change for review. Change subject: core: remove unneeded _newMasterStorageDomainId ......................................................................
core: remove unneeded _newMasterStorageDomainId Change-Id: I592f77e2c583b8ea8360c60006a31bc5d62d3904 Signed-off-by: Federico Simoncelli <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java 3 files changed, 15 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/42/28442/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 b72e515..5d6560a 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 @@ -51,19 +51,20 @@ @NonTransactiveCommandAttribute(forceCompensation = true) public class DeactivateStorageDomainCommand<T extends StorageDomainPoolParametersBase> extends StorageDomainCommandBase<T> { - protected Guid _newMasterStorageDomainId = Guid.Empty; private StorageDomain _newMaster; protected boolean _isLastMaster; protected boolean canChooseInactiveDomainAsMaster; protected boolean canChooseCurrentMasterAsNewMaster; protected StorageDomain getNewMaster(boolean duringReconstruct) { - if (_newMaster == null && Guid.Empty.equals(_newMasterStorageDomainId)) { + if (_newMaster == null) { _newMaster = electNewMaster(duringReconstruct, canChooseInactiveDomainAsMaster, canChooseCurrentMasterAsNewMaster); - } else if (_newMaster == null) { - _newMaster = getStorageDomainDAO().get(_newMasterStorageDomainId); } return _newMaster; + } + + protected Guid getNewMasterId(boolean duringReconstruct) { + return (getNewMaster(duringReconstruct) == null) ? Guid.Empty : getNewMaster(duringReconstruct).getId(); } protected void setNewMaster(StorageDomain value) { @@ -223,7 +224,7 @@ new DeactivateStorageDomainVDSCommandParameters(getStoragePool().getId(), getStorageDomain() .getId(), - _newMasterStorageDomainId, + getNewMasterId(false), getStoragePool().getmaster_domain_version())); } freeLock(); @@ -261,7 +262,7 @@ public EventResult call() { runSynchronizeOperation(new AfterDeactivateSingleAsyncOperationFactory(), _isLastMaster, - _newMasterStorageDomainId); + getNewMasterId(false)); return null; } }); @@ -283,7 +284,7 @@ getStorageDomain().getId(), map.getStatus()); } getStoragePoolIsoMapDAO().updateStatus(map.getId(), map.getStatus()); - if (!Guid.Empty.equals(_newMasterStorageDomainId)) { + if (!Guid.Empty.equals(getNewMasterId(false))) { StoragePoolIsoMap mapOfNewMaster = getNewMaster(false).getStoragePoolIsoMapData(); mapOfNewMaster.setStatus(StorageDomainStatus.Active); getStoragePoolIsoMapDAO().updateStatus(mapOfNewMaster.getId(), mapOfNewMaster.getStatus()); @@ -322,7 +323,6 @@ final StorageDomain newMaster = getNewMaster(duringReconstruct); if (newMaster != null) { newMaster.getStorageStaticData().setLastTimeUsedAsMaster(System.currentTimeMillis()); - _newMasterStorageDomainId = newMaster.getId(); if (newMaster.getStorageDomainType() != StorageDomainType.Master) { executeInNewTransaction(new TransactionMethod<Object>() { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java index b0ef650..fa8800d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java @@ -46,7 +46,7 @@ public ReconstructMasterDomainCommand(T parameters) { super(parameters); - _newMasterStorageDomainId = parameters.getNewMasterDomainId(); + setNewMaster(getStorageDomainDAO().get(parameters.getNewMasterDomainId())); canChooseInactiveDomainAsMaster = parameters.isCanChooseInactiveDomainAsMaster(); canChooseCurrentMasterAsNewMaster = parameters.isCanChooseCurrentMasterAsNewMaster(); } @@ -96,7 +96,7 @@ proceedStorageDomainTreatmentByDomainType(true); // To issue a reconstructMaster you need to set the domain inactive unless the selected domain is the current master - if (getParameters().isInactive() && !getStorageDomain().getId().equals(_newMasterStorageDomainId)) { + if (getParameters().isInactive() && !getStorageDomain().getId().equals(getNewMasterId(true))) { executeInNewTransaction(new TransactionMethod<Void>() { @Override public Void runInTransaction() { @@ -139,7 +139,7 @@ return runVdsCommand(VDSCommandType.ReconstructMaster, new ReconstructMasterVDSCommandParameters(getVds().getId(), getVds().getVdsSpmId(), getStoragePool().getId(), - getStoragePool().getName(), _newMasterStorageDomainId, domains, + getStoragePool().getName(), getNewMasterId(true), domains, getStoragePool().getmaster_domain_version())).getSucceeded(); } @@ -242,13 +242,13 @@ runVdsCommand( VDSCommandType.ConnectStoragePool, new ConnectStoragePoolVDSCommandParameters(vds, getStoragePool(), - _newMasterStorageDomainId, storagePoolIsoMap, true)); + getNewMasterId(true), storagePoolIsoMap, true)); } catch (VdcBLLException ex) { if (VdcBllErrors.StoragePoolUnknown == ex.getVdsError().getCode()) { VDSReturnValue returnVal = runVdsCommand( VDSCommandType.ConnectStoragePool, new ConnectStoragePoolVDSCommandParameters(vds, getStoragePool(), - _newMasterStorageDomainId, storagePoolIsoMap)); + getNewMasterId(true), storagePoolIsoMap)); if (!returnVal.getSucceeded()) { log.errorFormat("Post reconstruct actions (connectPool) did not complete on host {0} in the pool. error {1}", vds.getId(), diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java index d7e1c74..eebf961 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java @@ -75,8 +75,7 @@ } private StorageDomain loadTargetedMasterDomain() { - return getStorageDomainDAO().get( - _newMasterStorageDomainId); + return getStorageDomainDAO().get(getNewMasterId(false)); } @Override @@ -91,7 +90,7 @@ .connectStorageToDomainByVdsId(getNewMaster(false), getVds().getId())) { ((EventQueue) EjbUtils.findBean(BeanType.EVENTQUEUE_MANAGER, BeanProxyType.LOCAL)).submitEventSync(new Event(getParameters().getStoragePoolId(), - _newMasterStorageDomainId, + getNewMasterId(false), null, EventType.RECOVERY, ""), new Callable<EventResult>() { -- To view, visit http://gerrit.ovirt.org/28442 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I592f77e2c583b8ea8360c60006a31bc5d62d3904 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
