From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <f.ebner@proxmox.com> 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 61CC762CFC for <pve-devel@lists.proxmox.com>; Thu, 1 Oct 2020 13:15:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 53713209A3 for <pve-devel@lists.proxmox.com>; 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 1C76320976 for <pve-devel@lists.proxmox.com>; 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 D1E9A45B99 for <pve-devel@lists.proxmox.com>; Thu, 1 Oct 2020 13:15:40 +0200 (CEST) From: Fabian Ebner <f.ebner@proxmox.com> To: pve-devel@lists.proxmox.com Date: Thu, 1 Oct 2020 13:15:33 +0200 Message-Id: <20201001111535.13721-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201001111535.13721-1-f.ebner@proxmox.com> References: <20201001111535.13721-1-f.ebner@proxmox.com> 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. [replication.pm] Subject: [pve-devel] [PATCH guest-common 2/4] also consider storages from replication state on full removal X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Thu, 01 Oct 2020 11:15:43 -0000 This prevents left-over volumes in the following situation: 1. previous replication with volumes from different storages A and B exists 2. remove all volumes from storage B from the guest configuration 3. schedule full removal before the next normal replication 4. replication target still has the volumes on B Signed-off-by: Fabian Ebner <f.ebner@proxmox.com> --- PVE/Replication.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/PVE/Replication.pm b/PVE/Replication.pm index ae0f145..15845bb 100644 --- a/PVE/Replication.pm +++ b/PVE/Replication.pm @@ -245,6 +245,7 @@ sub replicate { if ($remove_job eq 'full' && $jobcfg->{target} ne $local_node) { # remove all remote volumes my @store_list = map { (PVE::Storage::parse_volume_id($_))[0] } @$sorted_volids; + push @store_list, @{$state->{storeid_list}}; my %hash = map { $_ => 1 } @store_list; -- 2.20.1