From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.ebner@proxmox.com>
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 5A83B76671
for <pve-devel@lists.proxmox.com>; Tue, 19 Oct 2021 09:55:14 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 43E88299BB
for <pve-devel@lists.proxmox.com>; Tue, 19 Oct 2021 09:55:13 +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 53FC5298EC
for <pve-devel@lists.proxmox.com>; 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 45C09468DF
for <pve-devel@lists.proxmox.com>; Tue, 19 Oct 2021 09:55:04 +0200 (CEST)
From: Fabian Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 19 Oct 2021 09:54:54 +0200
Message-Id: <20211019075459.14328-6-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-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.268 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 2/4] replication: prepare: return
additional information about snapshots
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 19 Oct 2021 07:55:14 -0000
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 <f.ebner@proxmox.com>
---
Depends on pve-storage for the new volume_snapshot_info function.
Build-breaks old pve-manager, because the test there assumes
volume_snapshot_list is used.
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};
}
}
}
--
2.30.2