A to-be-deleted snapshot might be actively used by replication, resulting in a not (or only partially) removed snapshot and locked (snapshot-delete) container. Simply wait a few seconds for any ongoing replication.
Signed-off-by: Fabian Ebner <[email protected]> --- New in v3. src/PVE/API2/LXC/Snapshot.pm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/PVE/API2/LXC/Snapshot.pm b/src/PVE/API2/LXC/Snapshot.pm index 160e5eb..8009586 100644 --- a/src/PVE/API2/LXC/Snapshot.pm +++ b/src/PVE/API2/LXC/Snapshot.pm @@ -10,6 +10,7 @@ use PVE::INotify; use PVE::Cluster qw(cfs_read_file); use PVE::AccessControl; use PVE::Firewall; +use PVE::GuestHelpers; use PVE::Storage; use PVE::RESTHandler; use PVE::RPCEnvironment; @@ -198,11 +199,20 @@ __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::LXC::Config->snapshot_delete($vmid, $snapname, $param->{force}); }; + my $realcmd = sub { + if ($param->{force}) { + $do_delete->(); + } else { + my $logfn = sub { print "$_[0]\n"; }; + PVE::GuestHelpers::run_with_replication_guard($vmid, 10, $logfn, $do_delete); + } + }; + return $rpcenv->fork_worker('vzdelsnapshot', $vmid, $authuser, $realcmd); }}); -- 2.30.2 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
