From: Wolfgang Link <w.link@proxmox.com>
Date: Mon, 12 Jun 2017 08:38:20 +0000 (+0200)
Subject: Make rollback compatible with storage replica.
X-Git-Url: https://git.proxmox.com/?p=pve-guest-common.git;a=commitdiff_plain;h=683a30e0623070737f2ce90c21f3bba2d4b25e03

Make rollback compatible with storage replica.

If we rollback we have to clean up all local replication snapshots.
---

diff --git a/PVE/AbstractConfig.pm b/PVE/AbstractConfig.pm
index 08cbb6a..f4c8c4e 100644
--- a/PVE/AbstractConfig.pm
+++ b/PVE/AbstractConfig.pm
@@ -592,6 +592,17 @@ sub snapshot_rollback {
 	return $res;
     };
 
+    my $repl_conf = PVE::ReplicationConfig->new();
+    if ($repl_conf->check_for_existing_jobs($vmid, 1)) {
+	# remove all replication snapshots
+	my $volumes = $class->get_replicatable_volumes($storecfg, $conf, 1);
+	my $sorted_volids = [ sort keys %$volumes ];
+
+	# remove all local replication snapshots (jobid => undef)
+	my $logfunc = sub { my $line = shift; chomp $line; print "$line\n"; };
+	PVE::Replication::prepare($storecfg, $sorted_volids, undef, 0, undef, $logfunc);
+    }
+    
     my $snap = &$get_snapshot_config();
 
     $class->__snapshot_foreach_volume($snap, sub {