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 CBF669064C for ; Thu, 22 Sep 2022 13:00:57 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A83D37C0A for ; Thu, 22 Sep 2022 13:00:27 +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 for ; Thu, 22 Sep 2022 13:00:27 +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 E1ABD44536 for ; Thu, 22 Sep 2022 13:00:26 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Thu, 22 Sep 2022 13:00:23 +0200 Message-Id: <20220922110023.115994-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.034 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 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: avoid "expected snapshot missing warning" when irrelevant 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: Thu, 22 Sep 2022 11:00:57 -0000 Namely, when there are no snapshots at all on the volume, which also is the case when the volume doesn't exist. This happens when a fresh volume is added to an already replicated guest. Fixes replication tests in pve-manager, which didn't like the additional output. Fixes: c0b2948 ("replication: prepare: safeguard against removal if expected snapshot is missing") Signed-off-by: Fiona Ebner --- src/PVE/Replication.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PVE/Replication.pm b/src/PVE/Replication.pm index 8591d0e..680ffe1 100644 --- a/src/PVE/Replication.pm +++ b/src/PVE/Replication.pm @@ -178,7 +178,7 @@ sub prepare { $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; + if !$removal_ok && $last_sync > 1 && scalar(keys $info->%*) > 0; for my $snap (keys $info->%*) { if ( # check if it's a stale replication snapshot -- 2.30.2