pvesr: prepare_local_job: fixup

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2017-06-08 11:40:03 +02:00 committed by Dietmar Maurer
parent d8cd8e8cf9
commit 544bb4e2a0

View File

@ -129,18 +129,19 @@ __PACKAGE__->register_method ({
my $snapname = PVE::ReplicationState::replication_snapshot_name($jobid, $last_sync); my $snapname = PVE::ReplicationState::replication_snapshot_name($jobid, $last_sync);
# find replication snapshots # find replication snapshots
my $volids = [];
foreach my $storeid (@$storage_list) { foreach my $storeid (@$storage_list) {
my $scfg = PVE::Storage::storage_config($storecfg, $storeid); my $scfg = PVE::Storage::storage_config($storecfg, $storeid);
my $plugin = PVE::Storage::Plugin->lookup($scfg->{type}); my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
my $images = $plugin->list_images($storeid, $scfg, $vmid, undef, $cache); my $images = $plugin->list_images($storeid, $scfg, $vmid, undef, $cache);
my $volids = [ map { $_->{volid} } @$images ]; push @$volids, map { $_->{volid} } @$images;
my ($last_snapshots, $cleaned_replicated_volumes) = PVE::Replication::prepare($storecfg, $volids, $jobid, $last_sync, $parent_snapname, $logfunc); }
foreach my $volid (keys %$cleaned_replicated_volumes) { my ($last_snapshots, $cleaned_replicated_volumes) = PVE::Replication::prepare($storecfg, $volids, $jobid, $last_sync, $parent_snapname, $logfunc);
if (!$wanted_volids->{$volid}) { foreach my $volid (keys %$cleaned_replicated_volumes) {
$logfunc->("$jobid: delete stale volume '$volid'"); if (!$wanted_volids->{$volid}) {
PVE::Storage::vdisk_free($storecfg, $volid); $logfunc->("$jobid: delete stale volume '$volid'");
delete $last_snapshots->{$volid}; PVE::Storage::vdisk_free($storecfg, $volid);
} delete $last_snapshots->{$volid};
} }
} }