From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH guest-common 1/4] replication: refactor finding most recent common replication snapshot
Date: Tue, 19 Oct 2021 09:54:53 +0200 [thread overview]
Message-ID: <20211019075459.14328-5-f.ebner@proxmox.com> (raw)
In-Reply-To: <20211019075459.14328-1-f.ebner@proxmox.com>
By using a single loop instead. Should make the code more readable,
but also more efficient.
Suggested-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
---
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
next prev parent reply other threads:[~2021-10-19 7:55 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-19 7:54 [pve-devel] [PATCH-SERIES storage/guest-common/manager] Follow-up for fixing replication/rollback interaction Fabian Ebner
2021-10-19 7:54 ` [pve-devel] [PATCH storage 1/3] plugin: add volume_snapshot_info function Fabian Ebner
2021-10-19 7:54 ` [pve-devel] [PATCH storage 2/3] plugin: remove volume_snapshot_list Fabian Ebner
2021-10-19 7:54 ` [pve-devel] [PATCH storage 3/3] bump APIVER and APIAGE Fabian Ebner
2021-10-19 7:54 ` Fabian Ebner [this message]
2021-10-19 7:54 ` [pve-devel] [PATCH guest-common 2/4] replication: prepare: return additional information about snapshots Fabian Ebner
2021-10-19 7:54 ` [pve-devel] [PATCH guest-common 3/4] replication: find common snapshot: use additional information Fabian Ebner
2021-10-19 7:54 ` [pve-devel] [RFC guest-common 4/4] config: snapshot delete check: use volume_snapshot_info Fabian Ebner
2021-10-19 7:54 ` [pve-devel] [PATCH manager 1/3] test: replication: avoid implicit return for volume_snapshot Fabian Ebner
2021-10-19 7:54 ` [pve-devel] [PATCH manager 2/3] test: replication: mock volume_snapshot_info Fabian Ebner
2021-10-19 7:54 ` [pve-devel] [PATCH manager 3/3] test: replication: remove mocking for obsolete volume_snapshot_list Fabian Ebner
2021-11-09 16:50 ` [pve-devel] applied-series: [PATCH-SERIES storage/guest-common/manager] Follow-up for fixing replication/rollback interaction Fabian Grünbichler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211019075459.14328-5-f.ebner@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox