Arik Hadas has uploaded a new change for review. Change subject: core: unlock the VM after unsuccessful migration ......................................................................
core: unlock the VM after unsuccessful migration This patch fixes a regression that caused VM to remain locked after migration fails (in all rerun attempts). Change-Id: I83de3934f801bf5c9be22173b5caf8ae0bf5b519 Bug-Url: https://bugzilla.redhat.com/1086280 Signed-off-by: Arik Hadas <aha...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java 1 file changed, 9 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/26686/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java index c91a106..be8d2a3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/MigrateVmCommand.java @@ -79,10 +79,15 @@ @Override protected void failedToRunVm() { - // In case the migration failed and the VM turned back to Up in the - // source, we don't need to handle it as a VM that failed to run - if (getVm().getStatus() != VMStatus.Up) { - super.failedToRunVm(); + try { + // In case the migration failed and the VM turned back to Up in the + // source, we don't need to handle it as a VM that failed to run + if (getVm().getStatus() != VMStatus.Up) { + super.failedToRunVm(); + } + } + finally { + freeLock(); } } -- To view, visit http://gerrit.ovirt.org/26686 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I83de3934f801bf5c9be22173b5caf8ae0bf5b519 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.4 Gerrit-Owner: Arik Hadas <aha...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
