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 A59C8766A4 for ; Tue, 19 Oct 2021 09:55:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9656B29910 for ; Tue, 19 Oct 2021 09:55:10 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 27A4A298D1 for ; Tue, 19 Oct 2021 09:55:09 +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 8543D468DE for ; Tue, 19 Oct 2021 09:55:03 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 19 Oct 2021 09:54:53 +0200 Message-Id: <20211019075459.14328-5-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211019075459.14328-1-f.ebner@proxmox.com> References: <20211019075459.14328-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.272 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 Subject: [pve-devel] [PATCH guest-common 1/4] replication: refactor finding most recent common replication snapshot 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: Tue, 19 Oct 2021 07:55:10 -0000 By using a single loop instead. Should make the code more readable, but also more efficient. Suggested-by: Fabian Grünbichler Signed-off-by: Fabian Ebner --- src/PVE/Replication.pm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/PVE/Replication.pm b/src/PVE/Replication.pm index 098ac00..32395ed 100644 --- a/src/PVE/Replication.pm +++ b/src/PVE/Replication.pm @@ -67,17 +67,19 @@ sub find_common_replication_snapshot { $base_snapshots->{$volid} = $parent_snapname; } else { # First, try all replication snapshots. - my @desc_sorted_snap = - map { $_->[1] } sort { $b->[0] <=> $a->[0] } - grep { $_->[0] != 0 } # only consider replication snapshots - map { [ ($_ =~ /__replicate_\Q$vmid\E-(?:\d+)_(\d+)_/)[0] || 0, $_ ] } - keys %{$remote_snapshots->{$volid}}; - - foreach my $remote_snap (@desc_sorted_snap) { - if (defined($last_snapshots->{$volid}->{$remote_snap})) { - $base_snapshots->{$volid} = $remote_snap; - last; - } + my $most_recent = [0, undef]; + for my $remote_snap (keys $remote_snapshots->{$volid}->%*) { + next if !defined($last_snapshots->{$volid}->{$remote_snap}); + + my $timestamp = ($remote_snap =~ /__replicate_\Q$vmid\E-(?:\d+)_(\d+)_/)[0]; + next if !$timestamp; + + $most_recent = [$timestamp, $remote_snap] if $timestamp > $most_recent->[0]; + } + + if ($most_recent->[1]) { + $base_snapshots->{$volid} = $most_recent->[1]; + next; } # Then, try config snapshots ($parent_snapname was already tested for above). -- 2.30.2