Yair Zaslavsky has submitted this change and it was merged. Change subject: engine: if connect storage pool fails on version mismatch, do reconstruct master ...................................................................... engine: if connect storage pool fails on version mismatch, do reconstruct master The following patch will allow to perform reconstruct from InitVdsOnUp, in case that we can not connect to pool because of wrong master version or missing master domain. Using of event queue will protect from parallel reconstructs and from other races. The flow is a following: 1. Try connect to pool 2. If failed on wrong master domain or its version - do reconstruct 3. If success move host to UP Please note: I remove an update of vms at spm after reconstruct, because of it will be removed at the future and that code is actually failed a one host scenario. Change-Id: Ia0d11c068399664daf85a6b03e67d25cd382707e Bug-Url: https://bugzilla.redhat.com/882837 Signed-off-by: Michael Kublin <mkublin@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InitVdsOnUpCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/eventqueue/EventQueueMonitor.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectHostToStoragePoolServersCommand.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 M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHandlingCommandBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ReconstructMasterParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/eventqueue/EventType.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/dbbroker/auditloghandling/AuditLogableBase.java 9 files changed, 118 insertions(+), 40 deletions(-) Approvals: Yair Zaslavsky: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/10103 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia0d11c068399664daf85a6b03e67d25cd382707e Gerrit-PatchSet: 7 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <mkublin@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Ayal Baron <abaron@redhat.com> Gerrit-Reviewer: Barak Azulay <bazulay@redhat.com> Gerrit-Reviewer: Daniel Erez <derez@redhat.com> Gerrit-Reviewer: Liron Aravot <laravot@redhat.com> Gerrit-Reviewer: Maor Lipchuk <mlipchuk@redhat.com> Gerrit-Reviewer: Michael Kublin <mkublin@redhat.com> Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: Yair Zaslavsky <yzaslavs@redhat.com>