From a04a32bdc2f3adb5172daed3ee57fe6bbe7004fc Mon Sep 17 00:00:00 2001 From: Stefan Priebe Date: Tue, 1 Jan 2013 22:59:55 +0100 Subject: [PATCH] QemuMigrate: phase2_cleanup misses migrate_cancel Signed-off-by: Stefan Priebe (cherry picked from commit 19168b91ae543aa6e4dede2f10b705ca0f07990f) --- PVE/QemuMigrate.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm index 4239e511..de2ee578 100644 --- a/PVE/QemuMigrate.pm +++ b/PVE/QemuMigrate.pm @@ -470,6 +470,12 @@ sub phase2_cleanup { $self->log('info', "aborting phase 2 - cleanup resources"); + $self->log('info', "migrate_cancel"); + eval { + PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "migrate_cancel"); + }; + $self->log('info', "migrate_cancel error: $@") if $@; + my $conf = $self->{vmconf}; delete $conf->{lock}; eval { PVE::QemuServer::update_config_nolock($vmid, $conf, 1) };