Tal Nisan has uploaded a new change for review. Change subject: core: Changed master connection type in RecoveryStoragePool command ......................................................................
core: Changed master connection type in RecoveryStoragePool command As a part of the effort to remove the type of storage pool changed connection to new master in RecoveryStoragePool command to use the storage helper of the type of new master, until now the old master type was used since it didn't make any difference since the types of the old and new were always the same Change-Id: Ifb0b0f98bdd239f201add78b08e8c1f86cf84757 Relates-To: https://bugzilla.redhat.com/1038053 Signed-off-by: Tal Nisan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/23344/1 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 0cdb54a..5f976e7 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 @@ -68,9 +68,6 @@ if (domain.getStorageDomainSharedStatus() != StorageDomainSharedStatus.Unattached) { addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_STATUS_ILLEGAL); returnValue = false; - } else if (domain.getStorageType() != getStoragePool().getStorageType()) { - addCanDoActionMessage(VdcBllMessages.ERROR_CANNOT_RECOVERY_STORAGE_POOL_STORAGE_TYPE_MISSMATCH); - returnValue = false; } } } @@ -90,7 +87,7 @@ @Override protected void executeCommand() { - if (StorageHelperDirector.getInstance().getItem(getStorageDomain().getStorageType()) + if (StorageHelperDirector.getInstance().getItem(getNewMaster(false).getStorageType()) .connectStorageToDomainByVdsId(getNewMaster(false), getVds().getId())) { ((EventQueue) EjbUtils.findBean(BeanType.EVENTQUEUE_MANAGER, BeanProxyType.LOCAL)).submitEventSync(new Event(getParameters().getStoragePoolId(), -- To view, visit http://gerrit.ovirt.org/23344 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb0b0f98bdd239f201add78b08e8c1f86cf84757 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
