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

cleanups

Browse Source
This commit is contained in:
Dietmar Maurer
2014-07-17 07:59:13 +02:00
parent f236eaf80e
commit 63da6d7983
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
PVE/Storage/RBDPlugin.pm
View File

@ -348,25 +348,28 @@ sub clone_image {
my ($vtype, $basename, $basevmid, undef, undef, $isBase) = my ($vtype, $basename, $basevmid, undef, undef, $isBase) =
$class->parse_volname($volname); $class->parse_volname($volname);
die "$volname is not a base image and snapname is not provided\n" if !$isBase && !length $snapname; die "$volname is not a base image and snapname is not provided\n"
if !$isBase && !length($snapname);
my $name = &$find_free_diskname($storeid, $scfg, $vmid); my $name = &$find_free_diskname($storeid, $scfg, $vmid);
warn "clone $volname: $basename snapname $snap to $name\n"; warn "clone $volname: $basename snapname $snap to $name\n";
if (length $snapname) { if (length($snapname)) {
my (undef, undef, undef, $protected) = rbd_volume_info($scfg, $storeid, $volname, $snapname); my (undef, undef, undef, $protected) = rbd_volume_info($scfg, $storeid, $volname, $snapname);
if (!$protected){ if (!$protected) {
my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'protect', $volname, '--snap', $snapname); my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'protect', $volname, '--snap', $snapname);
run_rbd_command($cmd, errmsg => "rbd protect $volname snap $snapname error"); run_rbd_command($cmd, errmsg => "rbd protect $volname snap $snapname error");
} }
} }
my $newvol = "$basename/$name"; my $newvol = "$basename/$name";
$newvol = $name if length $snapname; $newvol = $name if length($snapname);
my $cmd = &$rbd_cmd($scfg, $storeid, 'clone', &$add_pool_to_disk($scfg, $basename),
'--snap', $snap, &$add_pool_to_disk($scfg, $name));
my $cmd = &$rbd_cmd($scfg, $storeid, 'clone', &$add_pool_to_disk($scfg, $basename), '--snap', $snap, &$add_pool_to_disk($scfg, $name));
run_rbd_command($cmd, errmsg => "rbd clone '$basename' error"); run_rbd_command($cmd, errmsg => "rbd clone '$basename' error");
return $newvol; return $newvol;