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 391AB60FE0 for ; Fri, 14 Jan 2022 14:09:25 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1B0A22A318 for ; Fri, 14 Jan 2022 14:08:55 +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 3CA722A30D for ; Fri, 14 Jan 2022 14:08:53 +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 C3F5D43FBA for ; Fri, 14 Jan 2022 14:08:52 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 14 Jan 2022 14:08:49 +0100 Message-Id: <20220114130849.57616-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.135 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 Subject: [pve-devel] [PATCH v2 container] 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: Fri, 14 Jan 2022 13:09:25 -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 --- Changes from v1: * Check if replication is configured first. * Use "active replication" in log message. VM backups are not affected by this, because they don't use storage/config snapshots, but use pve-qemu's block layer. Decided to go for this approach rather than replication waiting on backup, because "full backup can take much longer than replication usually does", and even if we time out, we can just skip the removal for now and have the next backup do it. src/PVE/VZDump/LXC.pm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm index b7f7463..5bac089 100644 --- a/src/PVE/VZDump/LXC.pm +++ b/src/PVE/VZDump/LXC.pm @@ -8,9 +8,11 @@ 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; +use PVE::ReplicationConfig; use PVE::Storage; use PVE::Tools; use PVE::VZDump; @@ -476,8 +478,21 @@ sub cleanup { } if ($task->{cleanup}->{remove_snapshot}) { - $self->loginfo("cleanup temporary 'vzdump' snapshot"); - PVE::LXC::Config->snapshot_delete($vmid, 'vzdump', 0); + my $do_remove = sub { + $self->loginfo("cleanup temporary 'vzdump' snapshot"); + PVE::LXC::Config->snapshot_delete($vmid, 'vzdump', 0); + }; + + my $repl_conf = PVE::ReplicationConfig->new(); + eval { + if ($repl_conf->check_for_existing_jobs($vmid, 1)) { + $self->loginfo("checking/waiting for active replication.."); + PVE::GuestHelpers::guest_migration_lock($vmid, 600, $do_remove); + } else { + $do_remove->(); + } + }; + die "snapshot 'vzdump' was not (fully) removed - $@" if $@; } } -- 2.30.2