From fdbbed2facb0efb2ddba4318e9a689bb4d91adbe Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Wed, 23 Feb 2022 13:03:59 +0100 Subject: [PATCH] fix #3424: api: snapshot delete: wait for active replication A to-be-deleted snapshot might be actively used by replication, resulting in a not (or only partially) removed snapshot and locked (snapshot-delete) VM. Simply wait a few seconds for any ongoing replication. Signed-off-by: Fabian Ebner --- PVE/API2/Qemu.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm index 5ba9175d..11404d6e 100644 --- a/PVE/API2/Qemu.pm +++ b/PVE/API2/Qemu.pm @@ -4580,11 +4580,19 @@ __PACKAGE__->register_method({ my $snapname = extract_param($param, 'snapname'); - my $realcmd = sub { + my $do_delete = sub { PVE::Cluster::log_msg('info', $authuser, "delete snapshot VM $vmid: $snapname"); PVE::QemuConfig->snapshot_delete($vmid, $snapname, $param->{force}); }; + my $realcmd = sub { + if ($param->{force}) { + $do_delete->(); + } else { + PVE::GuestHelpers::guest_migration_lock($vmid, 10, $do_delete); + } + }; + return $rpcenv->fork_worker('qmdelsnapshot', $vmid, $authuser, $realcmd); }});