set long timeout for query-block-jobs

Like we do for other block job query commands. Seems those commands
can hangs for some time.

diff --git a/PVE/QMPClient.pm b/PVE/QMPClient.pm
index 3326c435fbc1d12cf380601bffe24c6948091442..4305cd63acb43543610030c63ce8f95f179314cc 100755 (executable)
--- a/PVE/QMPClient.pm
+++ b/PVE/QMPClient.pm
@@ -83,6 +83,7 @@ sub cmd {
        } elsif ($cmd->{execute} eq 'savevm-start' ||
                 $cmd->{execute} eq 'savevm-end' ||
                 $cmd->{execute} eq 'query-backup' ||
+                $cmd->{execute} eq 'query-block-jobs' ||
                 $cmd->{execute} eq 'backup-cancel' ||
                 $cmd->{execute} eq 'query-savevm' ||
                 $cmd->{execute} eq 'delete-drive-snapshot' ||

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 4e09f35e9ef8b4c84331ab84e302d6143089a1c4..a15bf265255943d9ea2fc4ab874431fef7a008e2 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -4634,9 +4634,9 @@ sub qemu_drive_mirror {
                sleep 1;
            }
        };
-       if ($@) {
-           eval{ PVE::QemuServer::vm_mon_cmd($vmid, "block-job-cancel", device => "drive-$drive"); };
-           die "mirroring error: $@";
+       if (my $err = $@) {
+           eval { PVE::QemuServer::vm_mon_cmd($vmid, "block-job-cancel", device => "drive-$drive"); };
+           die "mirroring error: $err";
        }
 
        if($vmiddst != $vmid){