From bcc87408c06c860d190981c5e77067e3d0c3298f Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Fri, 7 Nov 2014 15:31:56 +0100 Subject: [PATCH] cleanup: do not entry wait loop if block-job-cancel() fails. --- PVE/QemuServer.pm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 85ce28ad..778fb085 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -5214,13 +5214,15 @@ sub qemu_drive_mirror { }; if (my $err = $@) { - eval { vm_mon_cmd($vmid, "block-job-cancel", device => "drive-$drive"); }; - while (1) { - my $stats = vm_mon_cmd($vmid, "query-block-jobs"); - my $stat = @$stats[0]; - last if !$stat; - sleep 1; - } + eval { + vm_mon_cmd($vmid, "block-job-cancel", device => "drive-$drive"); + while (1) { + my $stats = vm_mon_cmd($vmid, "query-block-jobs"); + my $stat = @$stats[0]; + last if !$stat; + sleep 1; + } + }; die "mirroring error: $err"; }