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 281EC62D28 for ; Thu, 1 Oct 2020 13:16:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1321E2099F for ; Thu, 1 Oct 2020 13:15:43 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 2BFE82097C for ; Thu, 1 Oct 2020 13:15:41 +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 E1F0C45B98 for ; Thu, 1 Oct 2020 13:15:40 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 1 Oct 2020 13:15:32 +0200 Message-Id: <20201001111535.13721-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.049 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [pvesr.pm] Subject: [pve-devel] [PATCH manager 1/4] remove all stale replicated volumes 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, 01 Oct 2020 11:16:13 -0000 Commit 0433b86df6dfdf1d64ee09322719a02a91690707 introduced a regression where only stale replicated volumes with a snapshot with an older timestamp would be cleaned up. This restores the previous behavior where all stale replicated volumes, i.e. those with a replication snapshot, but not present in $wanted_volids, are cleaned up. Before this patch, after removing a volume from the guest config, it would only be cleaned up the second time the replication ran afterwards. Signed-off-by: Fabian Ebner --- PVE/CLI/pvesr.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PVE/CLI/pvesr.pm b/PVE/CLI/pvesr.pm index cb79e2bf..1f175470 100644 --- a/PVE/CLI/pvesr.pm +++ b/PVE/CLI/pvesr.pm @@ -137,8 +137,9 @@ __PACKAGE__->register_method ({ push @$volids, map { $_->{volid} } @$images; } my ($last_snapshots, $cleaned_replicated_volumes) = PVE::Replication::prepare($storecfg, $volids, $jobid, $last_sync, $parent_snapname, $logfunc); - foreach my $volid (keys %$cleaned_replicated_volumes) { - if (!$wanted_volids->{$volid}) { + foreach my $volid (@{$volids}) { + if (($last_snapshots->{$volid} || $cleaned_replicated_volumes->{$volid}) + && !$wanted_volids->{$volid}) { $logfunc->("$jobid: delete stale volume '$volid'"); PVE::Storage::vdisk_free($storecfg, $volid); delete $last_snapshots->{$volid}; -- 2.20.1