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 7A15362265 for ; Mon, 21 Feb 2022 12:58:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2D4B81825F for ; Mon, 21 Feb 2022 12:58:36 +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 933231819C 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 60CA346287 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:26 +0100 Message-Id: <20220221115828.76012-3-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-Type: text/plain; charset=UTF-8 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 1/2] partially fix #3424: vzdump: cleanup: 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:58:36 -0000 As replication and backup can happen at the same time, the vzdump snapshot might be actively used by replication when backup tries to cleanup, resulting in a not (or only partially) removed snapshot and locked (snapshot-delete) container. Wait up to 10 minutes for any ongoing replication. If replication doesn't finish in time, the fact that there is no attempt to remove the snapshot means that there's no risk for the container to end up in a locked state. And the beginning of the next backup will force remove the left-over snapshot, which will very likely succeed even at the storage layer, because the replication really should be done by then (subsequent replications shouldn't matter as they don't need to re-transfer the vzdump snapshot). Suggested-by: Fabian Grünbichler Signed-off-by: Fabian Ebner --- Dependency bump for guest-common needed. Changes from v2: * Use new helper. VM backups are not affected by this, because they don't use storage/config snapshots, but use pve-qemu's block layer. src/PVE/VZDump/LXC.pm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm index b7f7463..2d943a1 100644 --- a/src/PVE/VZDump/LXC.pm +++ b/src/PVE/VZDump/LXC.pm @@ -8,6 +8,7 @@ use File::Path; use POSIX qw(strftime); use PVE::Cluster qw(cfs_read_file); +use PVE::GuestHelpers; use PVE::INotify; use PVE::LXC::Config; use PVE::LXC; @@ -476,8 +477,14 @@ sub cleanup { } if ($task->{cleanup}->{remove_snapshot}) { - $self->loginfo("cleanup temporary 'vzdump' snapshot"); - PVE::LXC::Config->snapshot_delete($vmid, 'vzdump', 0); + my $do_delete = sub { + $self->loginfo("cleanup temporary 'vzdump' snapshot"); + PVE::LXC::Config->snapshot_delete($vmid, 'vzdump', 0); + }; + my $logfn = sub { $self->loginfo($_[0]); }; + + eval { PVE::GuestHelpers::run_with_replication_guard($vmid, 600, $logfn, $do_delete); }; + die "snapshot 'vzdump' was not (fully) removed - $@" if $@; } } -- 2.30.2