Change in ovirt-engine[master]: core: acquire locks in standard way in MoveOrCopyDiskCommand
Omer Frenkel has submitted this change and it was merged.
Change subject: core: acquire locks in standard way in MoveOrCopyDiskCommand
......................................................................
core: acquire locks in standard way in MoveOrCopyDiskCommand
In order to solve the race between VM migration and storage commands, we
need the storage commands to be able to acquire VM lock for their entire
execution process. That thing cannot be done when the locks are acquired
using explicit invocation of acquireLockInternal method, we need the
LockIdAndNameAttribute annotation.
Thus, this patch converts the way MoveOrCopyDiskCommand acquire its
locks such that it will be in the standard way.
Change-Id: Id4b5ef206581e5f9a1727c85b30f39802859583c
Bug-Url: https://bugzilla.redhat.com/952147
Signed-off-by: Arik Hadas <ahadas(a)redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/lsm/LiveMigrateDiskCommand.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/MoveOrCopyDiskCommandTest.java
3 files changed, 51 insertions(+), 41 deletions(-)
Approvals:
Omer Frenkel: Verified; Looks good to me, approved
--
To view, visit http://gerrit.ovirt.org/18523
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id4b5ef206581e5f9a1727c85b30f39802859583c
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com>
Gerrit-Reviewer: Arik Hadas <ahadas(a)redhat.com>
Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com>
Gerrit-Reviewer: Maor Lipchuk <mlipchuk(a)redhat.com>
Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com>
Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com>
Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server