Yair Zaslavsky has submitted this change and it was merged. Change subject: engine: We are not blocking reconstruct on domains during spm recontend (#843100) ...................................................................... engine: We are not blocking reconstruct on domains during spm recontend (#843100) https://bugzilla.redhat.com/843100 The problem was caused by race which was created by simentenious run of maintaince master storage domain and spm host. In order to solve a problem a locks will be used. A shared lock on pool will be use at MaintananceNumberOfVdssCommand if we are trying to maintaince spm. An exclusive lock will be used in DeactivateStorageDomainCommand if we are trying to deactivate master domain and shared lock on any other data domains. The patch contains a fix of possible NullPointerException at DeactivateStorageDomainCommand Change of order moving to maintaince of hosts at MaintananceNumberOfVdssCommand, in order to move spm a last to maintaince. Change-Id: Ia929d8cfab5904cb8e66d18cf50e037d36d8d373 Signed-off-by: Michael Kublin <mkublin(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintananceNumberOfVdssCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MaintananceVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 8 files changed, 255 insertions(+), 188 deletions(-) Approvals: Yair Zaslavsky: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/7172 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia929d8cfab5904cb8e66d18cf50e037d36d8d373 Gerrit-PatchSet: 3 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <mkublin(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com&gt; Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt; Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com&gt; Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com&gt; Gerrit-Reviewer: oVirt Jenkins CI Server