Itamar Heim has submitted this change and it was merged. Change subject: Revert "core: Prevent StopVm to interleave with other VM locked actions" ...................................................................... Revert "core: Prevent StopVm to interleave with other VM locked actions" This reverts commit 37411acc82c03ba8e3150e5d9b4aad2e6d39a414. in retrospective there is a much simpler and less intrusive solution[1] and it was noted this fix will cause restoreStatless to fail sense it will fail to take the vm lock on destory [1] the replacement fix - 42bdcd9 Change-Id: I0c12f4e2855e9ddfb6d696167b20352914825a9a Signed-off-by: Roy Golan <rgolan@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ShutdownVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java 3 files changed, 1 insertion(+), 20 deletions(-) Approvals: Roy Golan: Verified Omer Frenkel: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/25649 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0c12f4e2855e9ddfb6d696167b20352914825a9a Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.3 Gerrit-Owner: Roy Golan <rgolan@redhat.com> Gerrit-Reviewer: Itamar Heim <iheim@redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel@redhat.com> Gerrit-Reviewer: Roy Golan <rgolan@redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server