Roy Golan has submitted this change and it was merged. Change subject: core: fix possible deadlock ...................................................................... core: fix possible deadlock VmsMonitoring.analyzeVms() method takes a lock for each VM, which will not be unlocked when an exception is thrown inside VmAnalyzer.analyze(). On exception, analyzeVms() will not return anything and the calling method, perform(), will call unlockVms() with an empty list. Change-Id: I5926f935e64f51a17a3ff0ca8a19309ae7792b0c Signed-off-by: Andrej Krejcir <akrejcir(a)redhat.com&gt; --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VmsMonitoring.java 1 file changed, 12 insertions(+), 3 deletions(-) Approvals: Jenkins CI: Passed CI tests Roy Golan: Looks good to me, approved Andrej Krejcir: Verified -- To view, visit https://gerrit.ovirt.org/61614 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5926f935e64f51a17a3ff0ca8a19309ae7792b0c Gerrit-PatchSet: 11 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Andrej Krejcir <akrejcir(a)redhat.com&gt; Gerrit-Reviewer: Andrej Krejcir <akrejcir(a)redhat.com&gt; Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Jenny Tokar <jtokar(a)redhat.com&gt; Gerrit-Reviewer: Martin Sivák <msivak(a)redhat.com&gt; Gerrit-Reviewer: Phillip Bailey <phbailey(a)redhat.com&gt; Gerrit-Reviewer: Roman Mohr <rmohr(a)redhat.com&gt; Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com&gt; Gerrit-Reviewer: Yanir Quinn <yquinn(a)redhat.com&gt; Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;