From 3200c404a9b5e495593a7c6a9aa51996fd88fb06 Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Tue, 19 Oct 2021 09:54:54 +0200 Subject: [PATCH] replication: prepare: return additional information about snapshots This is backwards compatible, because existing users of prepare() only rely on the elements to evaluate to true or be defined. Signed-off-by: Fabian Ebner --- src/PVE/Replication.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/PVE/Replication.pm b/src/PVE/Replication.pm index 32395ed..4d4f62f 100644 --- a/src/PVE/Replication.pm +++ b/src/PVE/Replication.pm @@ -181,11 +181,11 @@ sub prepare { my $last_snapshots = {}; my $cleaned_replicated_volumes = {}; foreach my $volid (@$volids) { - my $list = PVE::Storage::volume_snapshot_list($storecfg, $volid); - foreach my $snap (@$list) { + my $info = PVE::Storage::volume_snapshot_info($storecfg, $volid); + for my $snap (keys $info->%*) { if ((defined($snapname) && ($snap eq $snapname)) || (defined($parent_snapname) && ($snap eq $parent_snapname))) { - $last_snapshots->{$volid}->{$snap} = 1; + $last_snapshots->{$volid}->{$snap} = $info->{$snap}; } elsif ($snap =~ m/^\Q$prefix\E/) { if ($last_sync != 0) { $logfunc->("delete stale replication snapshot '$snap' on $volid"); @@ -206,11 +206,11 @@ sub prepare { } # Last_sync=0 and a replication snapshot only occur, if the VM was stolen } else { - $last_snapshots->{$volid}->{$snap} = 1; + $last_snapshots->{$volid}->{$snap} = $info->{$snap}; } # Other snapshots might need to serve as replication base after rollback } else { - $last_snapshots->{$volid}->{$snap} = 1; + $last_snapshots->{$volid}->{$snap} = $info->{$snap}; } } }