From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Wed, 29 Apr 2020 14:19:41 +0000 (+0200)
Subject: qm nbdstop: cope graceful with errors
X-Git-Url: https://git.proxmox.com/?p=qemu-server.git;a=commitdiff_plain;h=aa6ebf6a4b5bf8b57d7f85f23ad85aefbbd3629c

qm nbdstop: cope graceful with errors

as the nbd server could have been stopped by something else.
Further, it makes no sense to die and mark the migration thus as
failed, just because of a NBD server stop issue.

At this point the migration hand off to the target was done already,
so normally we're good, if it fails we have other (followup) problems
anyway.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---

diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm
index f99d401..282fa86 100755
--- a/PVE/CLI/qm.pm
+++ b/PVE/CLI/qm.pm
@@ -274,7 +274,8 @@ __PACKAGE__->register_method ({
 
 	my $vmid = $param->{vmid};
 
-	PVE::QemuServer::nbd_stop($vmid);
+	eval { PVE::QemuServer::nbd_stop($vmid) };
+	warn $@ if $@;
 
 	return undef;
     }});