From: Wolfgang Bumiller <w.bumiller@proxmox.com>
Date: Wed, 23 May 2018 09:07:39 +0000 (+0200)
Subject: fix #1779: vzdump: ensure guest-fsfreeze-thaw is called on error
X-Git-Url: https://git.proxmox.com/?p=qemu-server.git;a=commitdiff_plain;h=f0f30448f9b56b8c0f7c93f5157b49e3ceda4267

fix #1779: vzdump: ensure guest-fsfreeze-thaw is called on error

as QMPClient's queue_execute can throw an error

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
---

diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm
index 42680f8..70abe99 100644
--- a/PVE/VZDump/QemuServer.pm
+++ b/PVE/VZDump/QemuServer.pm
@@ -417,7 +417,8 @@ sub archive {
 	    }
 	}
 
-	$qmpclient->queue_execute();
+	eval { $qmpclient->queue_execute() };
+	my $qmperr = $@;
 
 	if ($agent_running){
 	    eval { PVE::QemuServer::vm_mon_cmd($vmid, "guest-fsfreeze-thaw"); };
@@ -425,6 +426,7 @@ sub archive {
 		$self->logerr($err);
 	    }
 	}
+	die $qmperr if $qmperr;
 	die $qmpclient->{errors}->{$vmid} if $qmpclient->{errors}->{$vmid};
 
 	if ($cpid) {