Liron Aravot has uploaded a new change for review. Change subject: core: ReconstructMasterDomainCommand-added methods for commands execution ......................................................................
core: ReconstructMasterDomainCommand-added methods for commands execution added new methods for executing refresh/connect storage pool commands. Change-Id: I606989d1fc2ef058ddc4d304b2d6563236ce2ffb Signed-off-by: Liron Aravot <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ReconstructMasterDomainCommand.java 1 file changed, 24 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/7135/1 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 7a7aac1..ea0228a 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 @@ -205,28 +205,36 @@ return commandSucceeded; } + private VDSReturnValue executeConnectStoragePoolCommand(VDS vds) { + return Backend.getInstance() + .getResourceManager() + .RunVdsCommand( + VDSCommandType.ConnectStoragePool, + new ConnectStoragePoolVDSCommandParameters(vds.getId(), + getStoragePool().getId(), vds.getvds_spm_id(), + _newMasterStorageDomainId, getStoragePool() + .getmaster_domain_version())); + } + + private VDSReturnValue executeRefreshStoragePoolCommand(VDS vds) { + return Backend.getInstance() + .getResourceManager() + .RunVdsCommand( + VDSCommandType.RefreshStoragePool, + new RefreshStoragePoolVDSCommandParameters(vds.getId(), + getStoragePool().getId(), + _newMasterStorageDomainId, + getStoragePool().getmaster_domain_version())); + } + private void connectAndRefreshAllUpHosts(final boolean commandSucceeded) { try { for (VDS vds : getAllRunningVdssInPool()) { try { if (!_isLastMaster && commandSucceeded) { - VDSReturnValue returnValue = Backend.getInstance() - .getResourceManager() - .RunVdsCommand( - VDSCommandType.ConnectStoragePool, - new ConnectStoragePoolVDSCommandParameters(vds.getId(), - getStoragePool().getId(), vds.getvds_spm_id(), - _newMasterStorageDomainId, getStoragePool() - .getmaster_domain_version())); + VDSReturnValue returnValue = executeConnectStoragePoolCommand(vds); if (returnValue.getSucceeded()) { - Backend.getInstance() - .getResourceManager() - .RunVdsCommand( - VDSCommandType.RefreshStoragePool, - new RefreshStoragePoolVDSCommandParameters(vds.getId(), - getStoragePool().getId(), - _newMasterStorageDomainId, - getStoragePool().getmaster_domain_version())); + executeRefreshStoragePoolCommand(vds); } else { log.errorFormat("Post reconstruct actions (connectPool) did not complete on host {0} in the pool. error {1}", vds.getId(), -- To view, visit http://gerrit.ovirt.org/7135 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I606989d1fc2ef058ddc4d304b2d6563236ce2ffb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Aravot <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
