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 9F3FA7033E for ; Mon, 13 Jun 2022 12:30:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9D4E69E4A for ; Mon, 13 Jun 2022 12:30:05 +0200 (CEST) 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 EBE2C9E33 for ; Mon, 13 Jun 2022 12:30:03 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C277B429D9 for ; Mon, 13 Jun 2022 12:30:03 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 13 Jun 2022 12:29:59 +0200 Message-Id: <20220613102959.36556-7-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220613102959.36556-1-f.ebner@proxmox.com> References: <20220613102959.36556-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.050 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] [RFC v2 guest-common 4/4] replication: prepare: safeguard against removal if expected snapshot is missing 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, 13 Jun 2022 10:30:05 -0000 Such a check would also have prevented the issue in 1aa4d84 ("ReplicationState: purge state from non local vms") and other scenarios where state and disk state are inconsistent with regard to the last_sync snapshot. AFAICT, all existing callers intending to remove all snapshots use last_sync=1 so chaning the behavior for other (non-zero) values should be fine. Signed-off-by: Fabian Ebner --- New in v2. src/PVE/Replication.pm | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/PVE/Replication.pm b/src/PVE/Replication.pm index 33fcc48..8591d0e 100644 --- a/src/PVE/Replication.pm +++ b/src/PVE/Replication.pm @@ -153,9 +153,9 @@ sub remote_finalize_local_job { PVE::Tools::run_command($cmd, outfunc => $logger, errfunc => $logger); } -# Finds all local snapshots and removes replication snapshots not matching $last_sync. Use -# last_sync=0 (or undef) to prevent removal (useful if VM was stolen). Use last_sync=1 to remove all -# replication snapshots (limited to job if specified). +# Finds all local snapshots and removes replication snapshots not matching $last_sync after checking +# that it is present. Use last_sync=0 (or undef) to prevent removal (useful if VM was stolen). Use +# last_sync=1 to remove all replication snapshots (limited to job if specified). sub prepare { my ($storecfg, $volids, $jobid, $last_sync, $parent_snapname, $logfunc) = @_; @@ -173,12 +173,19 @@ sub prepare { my $cleaned_replicated_volumes = {}; foreach my $volid (@$volids) { my $info = PVE::Storage::volume_snapshot_info($storecfg, $volid); + + my $removal_ok = !defined($snapname) || $info->{$snapname}; + $removal_ok = 0 if $last_sync == 0; # last_sync=0 if the VM was stolen, don't remove! + $removal_ok = 1 if $last_sync == 1; # last_sync=1 is a special value used to remove all + $logfunc->("expected snapshot $snapname not present for $volid, not removing others") + if !$removal_ok && $last_sync > 1; + for my $snap (keys $info->%*) { if ( # check if it's a stale replication snapshot !(defined($snapname) && $snap eq $snapname) && !(defined($parent_snapname) && $snap eq $parent_snapname) && $snap =~ m/^\Q$prefix\E/ && - $last_sync != 0 # last_sync is 0 if the VM was stolen + $removal_ok ) { $logfunc->("delete stale replication snapshot '$snap' on $volid"); eval { -- 2.30.2