]> git.proxmox.com Git - pve-manager.git/commitdiff
Replication::prepare: track cleaned up volumes
authorFabian Grünbichler <f.gruenbichler@proxmox.com>
Thu, 8 Jun 2017 08:17:44 +0000 (10:17 +0200)
committerDietmar Maurer <dietmar@proxmox.com>
Thu, 8 Jun 2017 08:45:09 +0000 (10:45 +0200)
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
PVE/Replication.pm

index ab55c9bffd3f408943c0309a273f2165385cf598..396305aa2111eda8a1298a9d619df4dec0e60186 100644 (file)
@@ -187,20 +187,21 @@ sub prepare {
        PVE::ReplicationState::replication_snapshot_name($jobid, $last_sync);
 
     my $last_snapshots = {};
+    my $cleaned_replicated_volumes = {};
     foreach my $volid (@$volids) {
        my $list = PVE::Storage::volume_snapshot_list($storecfg, $volid);
-       my $found = 0;
        foreach my $snap (@$list) {
            if ($snap eq $snapname || (defined($parent_snapname) && ($snap eq $parent_snapname))) {
                $last_snapshots->{$volid}->{$snap} = 1;
            } elsif ($snap =~ m/^\Q$prefix\E/) {
                $logfunc->("delete stale replication snapshot '$snap' on $volid");
                PVE::Storage::volume_snapshot_delete($storecfg, $volid, $snap);
+               $cleaned_replicated_volumes->{$volid} = 1;
            }
        }
     }
 
-    return $last_snapshots;
+    return wantarray ? ($last_snapshots, $cleaned_replicated_volumes) : $last_snapshots;
 }
 
 sub replicate_volume {