Omer Frenkel has submitted this change and it was merged. Change subject: core: prevent removing vm from export domain while it is being imported ...................................................................... core: prevent removing vm from export domain while it is being imported While VM is being imported from export domain, there was no kind of lock that prevented other commands from modifing the VM. So while the import operation was on progress, the user could remove the VM which is obviously something we need to prevent. This patch prevents the scenario above from happening by modify the ImportVmCommand to take shared lock on the VM at the export domain for the whole execution of the command, and modify the RemoveVmFromImportExportCommand to take exclusive lock on the VM which is about to be removed. Change-Id: I5c34612f754375a9d15816e9972671e1b13023ad Bug-Url: https://bugzilla.redhat.com/733917 Signed-off-by: Arik Hadas <ahadas@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ImportVmCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromImportExportCommand.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/errors/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 7 files changed, 50 insertions(+), 1 deletion(-) Approvals: Omer Frenkel: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/16955 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c34612f754375a9d15816e9972671e1b13023ad Gerrit-PatchSet: 6 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <ahadas@redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas@redhat.com> Gerrit-Reviewer: Omer Frenkel <ofrenkel@redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server