Liron Ar has uploaded a new change for review. Change subject: set correct storage domain id ......................................................................
set correct storage domain id When executing RecoveryStoragePoolCommand, the master storage domain is loaded within the CDA method for the various checks - later on, if we do get for executing the master domain id might have changed meanwhile. The reload is done also today, but outside of the event - in this patch i just moved it to happen within till further changes to that mechanism - as it prevented the added domain to be marked the master, version not be incremented..etc. Change-Id: I7cce29e172dc7923efdd50997abe586b506f2fbf Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=955569 Signed-off-by: Liron Aravot <lara...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RecoveryStoragePoolCommand.java 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/02/14202/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 9efd668..2535119 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 @@ -89,7 +89,6 @@ protected void executeCommand() { if (StorageHelperDirector.getInstance().getItem(getStorageDomain().getStorageType()) .connectStorageToDomainByVdsId(getNewMaster(false), getVds().getId())) { - getParameters().setStorageDomainId(getStorageDomainId().getValue()); ((EventQueue) EjbUtils.findBean(BeanType.EVENTQUEUE_MANAGER, BeanProxyType.LOCAL)).submitEventSync(new Event(getParameters().getStoragePoolId(), _newMasterStorageDomainId, @@ -98,6 +97,7 @@ new Callable<EventResult>() { @Override public EventResult call() { + getParameters().setStorageDomainId(getMasterDomainIdFromDb()); StoragePoolIsoMap domainPoolMap = new StoragePoolIsoMap(getParameters() .getNewMasterDomainId(), -- To view, visit http://gerrit.ovirt.org/14202 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7cce29e172dc7923efdd50997abe586b506f2fbf Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Liron Ar <lara...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
