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 7EC7962F68 for ; Wed, 23 Feb 2022 13:04:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7AB892DF66 for ; Wed, 23 Feb 2022 13:04:04 +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 4202C2DF4E for ; Wed, 23 Feb 2022 13:04:03 +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 1BB0046E21 for ; Wed, 23 Feb 2022 13:04:03 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Wed, 23 Feb 2022 13:03:57 +0100 Message-Id: <20220223120359.45928-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220223120359.45928-1-f.ebner@proxmox.com> References: <20220223120359.45928-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.130 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 v4 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: Wed, 23 Feb 2022 12:04:34 -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 Co-developed-by: Fabian Grünbichler Signed-off-by: Fabian Ebner --- Changes from v3: * Unconditionally take the lock, to not race with replication job creation and better future-proofing. * Only log if we can't obtain the lock quickly rather than if a replication job is configured. * Make message more general, because it might be another snapshot removal operation holding the lock. src/PVE/VZDump/LXC.pm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm index b7f7463..078b74d 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,23 @@ sub cleanup { } if ($task->{cleanup}->{remove_snapshot}) { - $self->loginfo("cleanup temporary 'vzdump' snapshot"); - PVE::LXC::Config->snapshot_delete($vmid, 'vzdump', 0); + my $lock_obtained; + my $do_delete = sub { + $lock_obtained = 1; + $self->loginfo("cleanup temporary 'vzdump' snapshot"); + PVE::LXC::Config->snapshot_delete($vmid, 'vzdump', 0); + }; + + eval { + eval { PVE::GuestHelpers::guest_migration_lock($vmid, 1, $do_delete); }; + if (my $err = $@) { + die $err if $lock_obtained; + + $self->loginfo("waiting for active replication or other operation.."); + PVE::GuestHelpers::guest_migration_lock($vmid, 600, $do_delete); + } + }; + die "snapshot 'vzdump' was not (fully) removed - $@" if $@; } } -- 2.30.2