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 5E90D62D29 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 56230209A4 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 3206120980 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 E7D5145B42 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:34 +0200 Message-Id: <20201001111535.13721-3-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.048 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 3/4] rely only on storeid_list 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Oct 2020 11:16:13 -0000 Using the information from the replication state alone should be more correct. E.g. the configuration might contain a new, not yet replicated volume when the full removal happens, causing unneeded scanning on the target node. Signed-off-by: Fabian Ebner --- Could be squashed with the previous patch. There could be an edge case where the information from the config might be useful: namely if the replication state is missing/corrupt and full removal happens immediately without normal replication happening in between. But IMHO it's not worth keeping the extra code just for that... PVE/Replication.pm | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/PVE/Replication.pm b/PVE/Replication.pm index 15845bb..60cfc67 100644 --- a/PVE/Replication.pm +++ b/PVE/Replication.pm @@ -243,15 +243,8 @@ sub replicate { $logfunc->("start job removal - mode '${remove_job}'"); 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; - my $ssh_info = PVE::SSHInfo::get_ssh_info($jobcfg->{target}); - remote_prepare_local_job($ssh_info, $jobid, $vmid, [], [ keys %hash ], 1, undef, 1, $logfunc); - + remote_prepare_local_job($ssh_info, $jobid, $vmid, [], $state->{storeid_list}, 1, undef, 1, $logfunc); } # remove all local replication snapshots (lastsync => 0) prepare($storecfg, $sorted_volids, $jobid, 1, undef, $logfunc); -- 2.20.1