Michael Kublin has submitted this change and it was merged. Change subject: core: Deadlock on reconstruct master flow (#795105) ...................................................................... core: Deadlock on reconstruct master flow (#795105) https://bugzilla.redhat.com/795105 The following fix should solve a deadlock which was caused because of during reconstract flow were taken IrsProxyData.syncObj lock and we tried to take VdsManger._lockObj lock. The second thread started domain recovery and take a VdsManger._lockObj and tried to take IrsProxyData.syncObj These happend because of reconstruct already had succeeded and almost finished, that's why domain failover run with out any problem. Solution we don't need to run reconstruct inside critical section protected by IrsProxyData.syncObj Change-Id: I1e077a0722c4ae5a277fd85f11b8d0a353182c15 Signed-off-by: Michael Kublin <mkublin(a)redhat.com&gt; --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java 1 file changed, 38 insertions(+), 32 deletions(-) Approvals: Michael Kublin: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/5482 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1e077a0722c4ae5a277fd85f11b8d0a353182c15 Gerrit-PatchSet: 2 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: Haim Ateya <hateya(a)redhat.com&gt; Gerrit-Reviewer: Michael Kublin <mkublin(a)redhat.com&gt; Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com&gt; Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com&gt;