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 164476D02F for ; Thu, 12 Aug 2021 13:02:01 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0ABD52208F for ; Thu, 12 Aug 2021 13:01:31 +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 86D0A21FEF for ; Thu, 12 Aug 2021 13:01:24 +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 361194330A for ; Thu, 12 Aug 2021 13:01:18 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 12 Aug 2021 13:01:06 +0200 Message-Id: <20210812110111.73883-8-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210812110111.73883-1-f.ebner@proxmox.com> References: <20210812110111.73883-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.412 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 v3 guest-common 2/7] config: rollback: factor out helper for removing replication snapshots 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: Thu, 12 Aug 2021 11:02:01 -0000 Signed-off-by: Fabian Ebner --- src/PVE/AbstractConfig.pm | 49 ++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/src/PVE/AbstractConfig.pm b/src/PVE/AbstractConfig.pm index 493bf97..0d1c7ca 100644 --- a/src/PVE/AbstractConfig.pm +++ b/src/PVE/AbstractConfig.pm @@ -943,14 +943,39 @@ sub snapshot_delete { }); } +# Remove replication snapshots to make a rollback possible. +my $rollback_remove_replication_snapshots = sub { + my ($class, $vmid, $snap) = @_; + + my $storecfg = PVE::Storage::config(); + + my $repl_conf = PVE::ReplicationConfig->new(); + return if !$repl_conf->check_for_existing_jobs($vmid, 1); + + my $volumes = $class->get_replicatable_volumes($storecfg, $vmid, $snap, 1); + + # filter by what we actually iterate over below (excludes vmstate!) + my $volids = []; + $class->foreach_volume($snap, sub { + my ($vs, $volume) = @_; + + my $volid_key = $class->volid_key(); + my $volid = $volume->{$volid_key}; + + push @{$volids}, $volid if $volumes->{$volid}; + }); + + # remove all local replication snapshots (jobid => undef) + my $logfunc = sub { my $line = shift; chomp $line; print "$line\n"; }; + PVE::Replication::prepare($storecfg, $volids, undef, 1, undef, $logfunc); +}; + # Rolls back to a given snapshot. sub snapshot_rollback { my ($class, $vmid, $snapname) = @_; my $prepare = 1; - my $storecfg = PVE::Storage::config(); - my $data = {}; my $get_snapshot_config = sub { @@ -972,25 +997,7 @@ sub snapshot_rollback { $snap = $get_snapshot_config->($conf); if ($prepare) { - my $repl_conf = PVE::ReplicationConfig->new(); - if ($repl_conf->check_for_existing_jobs($vmid, 1)) { - my $volumes = $class->get_replicatable_volumes($storecfg, $vmid, $snap, 1); - - # filter by what we actually iterate over below (excludes vmstate!) - my $volids = []; - $class->foreach_volume($snap, sub { - my ($vs, $volume) = @_; - - my $volid_key = $class->volid_key(); - my $volid = $volume->{$volid_key}; - - push @{$volids}, $volid if $volumes->{$volid}; - }); - - # remove all local replication snapshots (jobid => undef) - my $logfunc = sub { my $line = shift; chomp $line; print "$line\n"; }; - PVE::Replication::prepare($storecfg, $volids, undef, 1, undef, $logfunc); - } + $rollback_remove_replication_snapshots->($class, $vmid, $snap); $class->foreach_volume($snap, sub { my ($vs, $volume) = @_; -- 2.30.2