From b0b756c14d58c3d84af41c7cd967cedddb32fd44 Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 30 Aug 2012 09:28:24 +0200
Subject: [PATCH] migrate: tolerate query-migrate errors

---
 PVE/QemuMigrate.pm | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 335bb32..0ad0eab 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -348,15 +348,28 @@ sub phase2 {
     my $lstat = 0;
     my $usleep = 2000000;
     my $i = 0;
+    my $err_count = 0;
     while (1) {
 	$i++;
 	my $avglstat = $lstat/$i if $lstat;
 
-	usleep ($usleep);
-	my $stat = PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "query-migrate");
+	usleep($usleep);
+	my $stat;
+	eval {
+	    $stat = PVE::QemuServer::vm_mon_cmd_nocheck($vmid, "query-migrate");
+	};
+	if (my $err = $@) {
+	    $err_count++;
+	    warn "query migrate failed: $err\n";
+	    if ($err_count <= 5) {
+		usleep(1000000);
+		next;
+	    }
+	    die "too many query migrate failures - aborting\n";
+	}
 	if ($stat->{status} =~ m/^(active|completed|failed|cancelled)$/im) {
 	    $merr = undef;
-
+	    $err_count = 0;
 	    if ($stat->{status} eq 'completed') {
 		my $delay = time() - $start;
 		if ($delay > 0) {
-- 
2.39.2