From 1770b70fdfeccbf1ace1b6d2f15afe1ef82b06cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Tue, 15 Mar 2022 13:28:27 +0100
Subject: [PATCH] api: snapshot delete: prefix lock-fail error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

otherwise users might get confused if they just get a message about a
migrate lock not being available..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 PVE/API2/Qemu.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 11404d6e..cb6973f1 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -4580,7 +4580,9 @@ __PACKAGE__->register_method({
 
 	my $snapname = extract_param($param, 'snapname');
 
+	my $lock_obtained;
 	my $do_delete = sub {
+	    $lock_obtained = 1;
 	    PVE::Cluster::log_msg('info', $authuser, "delete snapshot VM $vmid: $snapname");
 	    PVE::QemuConfig->snapshot_delete($vmid, $snapname, $param->{force});
 	};
@@ -4589,7 +4591,11 @@ __PACKAGE__->register_method({
 	    if ($param->{force}) {
 		$do_delete->();
 	    } else {
-		PVE::GuestHelpers::guest_migration_lock($vmid, 10, $do_delete);
+		eval { PVE::GuestHelpers::guest_migration_lock($vmid, 10, $do_delete); };
+		if (my $err = $@) {
+		    die $err if $lock_obtained;
+		    die "Failed to obtain guest migration lock - replication running?\n";
+		}
 	    }
 	};