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

rbd : free_image : unprotect snapshot is base

Browse Source 
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier
2013-02-05 12:55:36 +01:00
committed by Dietmar Maurer
parent 5b9b9b1449
commit 42d07b9ab3
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
PVE/Storage/RBDPlugin.pm
View File

@ -312,10 +312,22 @@ sub alloc_image {
sub free_image { sub free_image {
my ($class, $storeid, $scfg, $volname, $isBase) = @_; my ($class, $storeid, $scfg, $volname, $isBase) = @_;
my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'purge', $volname); my ($vtype, $name, $vmid, undef, undef, undef) =
$class->parse_volname($volname);
if ($isBase) {
my $snap = '__base__';
my (undef, undef, undef, $protected) = rbd_volume_info($scfg, $storeid, $name, $snap);
if ($protected){
my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'unprotect', $name, '--snap', $snap);
run_command($cmd, errmsg => "rbd unprotect $name snap $snap' error", errfunc => sub {});
}
}
my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'purge', $name);
run_command($cmd, errmsg => "rbd snap purge $volname' error", outfunc => sub {}, errfunc => sub {}); run_command($cmd, errmsg => "rbd snap purge $volname' error", outfunc => sub {}, errfunc => sub {});
$cmd = &$rbd_cmd($scfg, $storeid, 'rm', $volname); $cmd = &$rbd_cmd($scfg, $storeid, 'rm', $name);
run_command($cmd, errmsg => "rbd rm $volname' error", outfunc => sub {}, errfunc => sub {}); run_command($cmd, errmsg => "rbd rm $volname' error", outfunc => sub {}, errfunc => sub {});
return undef; return undef;