yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

volume_snapshot_delete: deactivate before deleting

Browse Source
This commit is contained in:
Wolfgang Bumiller
2015-09-25 12:02:33 +02:00
committed by Dietmar Maurer
parent 9b256d4676
commit 399581a2b3
5 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/Storage/Plugin.pm
View File

@ -709,6 +709,8 @@ sub volume_snapshot_delete {
my $path = $class->filesystem_path($scfg, $volname); my $path = $class->filesystem_path($scfg, $volname);
$class->deactivate_volume($storeid, $scfg, $volname, $snap, {});
my $cmd = ['/usr/bin/qemu-img', 'snapshot','-d', $snap, $path]; my $cmd = ['/usr/bin/qemu-img', 'snapshot','-d', $snap, $path];
run_command($cmd); run_command($cmd);

2
PVE/Storage/RBDPlugin.pm
View File

@ -569,6 +569,8 @@ sub volume_snapshot_delete {
return 1 if $running; return 1 if $running;
$class->deactivate_volume($storeid, $scfg, $volname, $snap, {});
my ($vtype, $name, $vmid) = $class->parse_volname($volname); my ($vtype, $name, $vmid) = $class->parse_volname($volname);
my (undef, undef, undef, $protected) = rbd_volume_info($scfg, $storeid, $name, $snap); my (undef, undef, undef, $protected) = rbd_volume_info($scfg, $storeid, $name, $snap);

2
PVE/Storage/SheepdogPlugin.pm
View File

@ -416,6 +416,8 @@ sub volume_snapshot_delete {
return 1 if $running; return 1 if $running;
$class->deactivate_volume($storeid, $scfg, $volname, $snap, {});
my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) = my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
$class->parse_volname($volname); $class->parse_volname($volname);

1
PVE/Storage/ZFSPoolPlugin.pm
View File

@ -462,6 +462,7 @@ sub volume_snapshot {
sub volume_snapshot_delete { sub volume_snapshot_delete {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_; my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
$class->deactivate_volume($storeid, $scfg, $volname, $snap, {});
$class->zfs_request($scfg, undef, 'destroy', "$scfg->{pool}/$volname\@$snap"); $class->zfs_request($scfg, undef, 'destroy', "$scfg->{pool}/$volname\@$snap");
} }

2
changelog.Debian
View File

@ -2,6 +2,8 @@ libpve-storage-perl (4.0-24) unstable; urgency=medium
* drbd: return correct used/avail/total sizes * drbd: return correct used/avail/total sizes
* volume_snapshot_delete: deactivate before deleting
-- Proxmox Support Team <support@proxmox.com> Fri, 25 Sep 2015 13:36:22 +0200 -- Proxmox Support Team <support@proxmox.com> Fri, 25 Sep 2015 13:36:22 +0200
libpve-storage-perl (4.0-23) unstable; urgency=medium libpve-storage-perl (4.0-23) unstable; urgency=medium