From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id D75871FF37F for ; Thu, 18 Apr 2024 09:07:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4D19F153AE; Thu, 18 Apr 2024 09:07:01 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 18 Apr 2024 09:06:47 +0200 Message-Id: <20240418070648.16462-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.070 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [replication.pm] Subject: [pve-devel] [PATCH guest-common] replication: snapshot cleanup: only attempt to remove snapshots that exist 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Since commit a6f5b35 ("replication: prepare: include volumes without snapshots in the result"), attempts would be made to remove previous replication snapshots from volumes on which they didn't exist. This was noticed by Thomas since the output of a replication test in pve-manager changed. The issue is not completely new, i.e. there was no check that the (previous) replication snapshot acutally exists before attempting removal during the cleanup phase. Fix the issue by adding such a check. The $replicate_snapshots hash is only used for this, so the change there is fine. Fixes: a6f5b35 ("replication: prepare: include volumes without snapshots in the result") Reported-by: Thomas Lamprecht Signed-off-by: Fiona Ebner --- src/PVE/Replication.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/PVE/Replication.pm b/src/PVE/Replication.pm index 984ea34..20c3485 100644 --- a/src/PVE/Replication.pm +++ b/src/PVE/Replication.pm @@ -336,7 +336,7 @@ sub replicate { foreach my $volid (@$sorted_volids) { $logfunc->("create snapshot '${sync_snapname}' on $volid"); PVE::Storage::volume_snapshot($storecfg, $volid, $sync_snapname); - $replicate_snapshots->{$volid} = 1; + $replicate_snapshots->{$volid}->{$sync_snapname} = 1; } }; my $err = $@; @@ -350,6 +350,7 @@ sub replicate { my $cleanup_local_snapshots = sub { my ($volid_hash, $snapname) = @_; foreach my $volid (sort keys %$volid_hash) { + next if !$volid_hash->{$volid}->{$snapname}; $logfunc->("delete previous replication snapshot '$snapname' on $volid"); eval { PVE::Storage::volume_snapshot_delete($storecfg, $volid, $snapname); }; warn $@ if $@; -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel