Tal Nisan has submitted this change and it was merged. Change subject: core: DiskImageDynamicDao - deadlock caused by wrong sorting ...................................................................... core: DiskImageDynamicDao - deadlock caused by wrong sorting updateAllDiskImageDynamicWithDiskIdByVmId is supposed to sort the DiskImageDynamicDao objects its updating in order to avoid deadlocks. Currently the sorting is done on the first object of the pair which is the vm id instead of the the image group id. This patch changes the sorting to be according the image group id as it was supposed to be. Change-Id: I4194c93b0e919543b5a5c1b3621dab0d4604c983 Bug-Url: https://bugzilla.redhat.com/1342317 Signed-off-by: Liron Aravot <laravot(a)redhat.com&gt; --- M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/DiskImageDynamicDaoImpl.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDynamicDaoTest.java 2 files changed, 37 insertions(+), 12 deletions(-) Approvals: Jenkins CI: Passed CI tests Allon Mureinik: Looks good to me, approved Liron Aravot: Verified -- To view, visit https://gerrit.ovirt.org/58915 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4194c93b0e919543b5a5c1b3621dab0d4604c983 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.6 Gerrit-Owner: Liron Aravot <laravot(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Liron Aravot <laravot(a)redhat.com&gt; Gerrit-Reviewer: Tal Nisan <tnisan(a)redhat.com&gt; Gerrit-Reviewer: gerrit-hooks <automation(a)ovirt.org&gt;