From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 6FB036222C for ; Mon, 21 Feb 2022 12:59:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2744B181F4 for ; Mon, 21 Feb 2022 12:58:35 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 7F01218192 for ; Mon, 21 Feb 2022 12:58:33 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5292945C39 for ; Mon, 21 Feb 2022 12:58:33 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 21 Feb 2022 12:58:27 +0100 Message-Id: <20220221115828.76012-4-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220221115828.76012-1-f.ebner@proxmox.com> References: <20220221115828.76012-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.131 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v3 container 2/2] fix #3424: api: snapshot delete: wait for active replication X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2022 11:59:05 -0000 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 --- 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