From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH v2 guest-common] replication: avoid "expected snapshot missing" warning when irrelevant
Date: Fri, 23 Sep 2022 10:16:47 +0200 [thread overview]
Message-ID: <20220923081647.20104-1-f.ebner@proxmox.com> (raw)
Only print it when there is a snapshot that would've been removed
without the safeguard. Mostly relevant when a new volume is added to
an already replicated guest.
Fixes replication tests in pve-manager.
Fixes: c0b2948 ("replication: prepare: safeguard against removal if expected snapshot is missing")
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
Changes from v1:
* Only warn when other snapshot would be removed without the
safeguard, not just when no other snapshot is present.
src/PVE/Replication.pm | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/PVE/Replication.pm b/src/PVE/Replication.pm
index 8591d0e..469ca19 100644
--- a/src/PVE/Replication.pm
+++ b/src/PVE/Replication.pm
@@ -177,16 +177,21 @@ sub prepare {
my $removal_ok = !defined($snapname) || $info->{$snapname};
$removal_ok = 0 if $last_sync == 0; # last_sync=0 if the VM was stolen, don't remove!
$removal_ok = 1 if $last_sync == 1; # last_sync=1 is a special value used to remove all
+
+ # check if it's a replication snapshot with the same $prefix but not the $last_sync one
+ my $potentially_stale = sub {
+ my ($snap) = @_;
+
+ return 0 if defined($snapname) && $snap eq $snapname;
+ return 0 if defined($parent_snapname) && $snap eq $parent_snapname;
+ return $snap =~ m/^\Q$prefix\E/;
+ };
+
$logfunc->("expected snapshot $snapname not present for $volid, not removing others")
- if !$removal_ok && $last_sync > 1;
+ if !$removal_ok && $last_sync > 1 && grep { $potentially_stale->($_) } keys $info->%*;
for my $snap (keys $info->%*) {
- if ( # check if it's a stale replication snapshot
- !(defined($snapname) && $snap eq $snapname) &&
- !(defined($parent_snapname) && $snap eq $parent_snapname) &&
- $snap =~ m/^\Q$prefix\E/ &&
- $removal_ok
- ) {
+ if ($potentially_stale->($snap) && $removal_ok) {
$logfunc->("delete stale replication snapshot '$snap' on $volid");
eval {
PVE::Storage::volume_snapshot_delete($storecfg, $volid, $snap);
--
2.30.2
next reply other threads:[~2022-09-23 8:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-23 8:16 Fiona Ebner [this message]
2022-09-26 9:27 ` [pve-devel] applied: " Thomas Lamprecht
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=20220923081647.20104-1-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal