Change in ovirt-engine[master]: core: DiskImageDynamicDao - deadlock caused by wrong sorting

[laravot at redhat.com]

Liron Aravot 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 at redhat.com>
---
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/DiskImageDaoTest.java
M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/DiskImageDynamicDaoTest.java
3 files changed, 47 insertions(+), 25 deletions(-)

Approvals:
  Jenkins CI: Passed CI tests
  Allon Mureinik: Looks good to me, approved
  Liron Aravot: Verified



-- 
To view, visit https://gerrit.ovirt.org/58882
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4194c93b0e919543b5a5c1b3621dab0d4604c983
Gerrit-PatchSet: 7
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Liron Aravot <laravot at redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini at redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas at redhat.com>
Gerrit-Reviewer: Freddy Rolland <frolland at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Liron Aravot <laravot at redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk at redhat.com>
Gerrit-Reviewer: Shmuel Leib Melamud <smelamud at redhat.com>
Gerrit-Reviewer: gerrit-hooks <automation at ovirt.org>