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 8E0A4702F9 for ; Mon, 13 Jun 2022 12:30:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 828DB9E49 for ; Mon, 13 Jun 2022 12:30:05 +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 id 8B95F9E1B for ; Mon, 13 Jun 2022 12:30:03 +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 63BB64303E for ; Mon, 13 Jun 2022 12:30:03 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 13 Jun 2022 12:29:57 +0200 Message-Id: <20220613102959.36556-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220613102959.36556-1-f.ebner@proxmox.com> References: <20220613102959.36556-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.050 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v2 guest-common 2/4] replication: rename last_snapshots to local_snapshots 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: Mon, 13 Jun 2022 10:30:35 -0000 because prepare() was changed in 8d1cd44 ("partially fix #3111: replication: be less picky when selecting incremental base") to return all local snapshots. Signed-off-by: Fabian Ebner --- New in v2. src/PVE/Replication.pm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/PVE/Replication.pm b/src/PVE/Replication.pm index fcd59bb..d84f469 100644 --- a/src/PVE/Replication.pm +++ b/src/PVE/Replication.pm @@ -36,10 +36,7 @@ sub find_common_replication_snapshot { my $last_sync_snapname = PVE::ReplicationState::replication_snapshot_name($jobid, $last_sync); - # test if we have a replication_ snapshot from last sync - # and remove all other/stale replication snapshots - - my $last_snapshots = + my $local_snapshots = prepare($storecfg, $volumes, $jobid, $last_sync, $parent_snapname, $logfunc); # prepare remote side @@ -58,7 +55,7 @@ sub find_common_replication_snapshot { my $base_snapshots = {}; foreach my $volid (@$volumes) { - my $local_info = $last_snapshots->{$volid}; + my $local_info = $local_snapshots->{$volid}; my $remote_info = $remote_snapshots->{$volid}; if (defined($local_info) && defined($remote_info)) { @@ -103,7 +100,7 @@ sub find_common_replication_snapshot { } } - return ($base_snapshots, $last_snapshots, $last_sync_snapname); + return ($base_snapshots, $local_snapshots, $last_sync_snapname); } sub remote_prepare_local_job { @@ -172,7 +169,7 @@ sub prepare { $prefix = '__replicate_'; } - my $last_snapshots = {}; + my $local_snapshots = {}; my $cleaned_replicated_volumes = {}; foreach my $volid (@$volids) { my $info = PVE::Storage::volume_snapshot_info($storecfg, $volid); @@ -200,12 +197,12 @@ sub prepare { $logfunc->("delete stale replication snapshot error: $err"); } } else { - $last_snapshots->{$volid}->{$snap} = $info->{$snap}; + $local_snapshots->{$volid}->{$snap} = $info->{$snap}; } } } - return wantarray ? ($last_snapshots, $cleaned_replicated_volumes) : $last_snapshots; + return wantarray ? ($local_snapshots, $cleaned_replicated_volumes) : $local_snapshots; } sub replicate_volume { @@ -291,7 +288,7 @@ sub replicate { my $ssh_info = PVE::SSHInfo::get_ssh_info($jobcfg->{target}, $migration_network); - my ($base_snapshots, $last_snapshots, $last_sync_snapname) = find_common_replication_snapshot( + my ($base_snapshots, $local_snapshots, $last_sync_snapname) = find_common_replication_snapshot( $ssh_info, $jobid, $vmid, $storecfg, $sorted_volids, $state->{storeid_list}, $last_sync, $conf, $logfunc); my $storeid_hash = {}; @@ -373,7 +370,7 @@ sub replicate { PVE::ReplicationState::record_sync_end($jobcfg, $state, $start_time); # remove old snapshots because they are no longer needed - $cleanup_local_snapshots->($last_snapshots, $last_sync_snapname); + $cleanup_local_snapshots->($local_snapshots, $last_sync_snapname); eval { remote_finalize_local_job($ssh_info, $jobid, $vmid, $sorted_volids, $start_time, $logfunc); -- 2.30.2