Arik Hadas has submitted this change and it was merged. Change subject: core: fix possible deadlock on update cluster version ...................................................................... core: fix possible deadlock on update cluster version Sort the VMs that are being updated according to the order that the monitoring updates VM related data to prevent a possible race when both are done within a transaction (with postgres lower or equal to 9.2 where updates of entries with foreign key locks the row of the foreign entity in the transaction scope). Change-Id: Iedceef969c8823200bbdb27a332831e9305aebcf Bug-Url: https://bugzilla.redhat.com/1366786 Signed-off-by: Arik Hadas <ahadas(a)redhat.com&gt; --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ClusterOperationCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateClusterCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/UpdateClusterCommandTest.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VmsMonitoring.java 4 files changed, 36 insertions(+), 17 deletions(-) Approvals: Shahar Havivi: Looks good to me, approved Arik Hadas: Verified; Passed CI tests -- To view, visit https://gerrit.ovirt.org/62525 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iedceef969c8823200bbdb27a332831e9305aebcf Gerrit-PatchSet: 11 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com&gt; Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shahar Havivi <shavivi(a)redhat.com&gt; Gerrit-Reviewer: Shmuel Leib Melamud <smelamud(a)redhat.com&gt; Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;