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

rbd, zfs, sheepdog: bugfix : fix alloc_image if name is specified

Browse Source 
Currently vmstate snapshot with rbd have wrong name,
because rbd alloc_image don't care if $name is provided

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier
2014-11-20 16:01:44 +01:00
committed by Dietmar Maurer
parent e3c51a6c38
commit 3fad260379
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/Storage/RBDPlugin.pm
View File

@ -382,7 +382,7 @@ sub alloc_image {
die "illegal name '$name' - sould be 'vm-$vmid-*'\n" die "illegal name '$name' - sould be 'vm-$vmid-*'\n"
if $name && $name !~ m/^vm-$vmid-/; if $name && $name !~ m/^vm-$vmid-/;
$name = &$find_free_diskname($storeid, $scfg, $vmid); $name = &$find_free_diskname($storeid, $scfg, $vmid) if !$name;
my $cmd = &$rbd_cmd($scfg, $storeid, 'create', '--image-format' , 2, '--size', int(($size+1023)/1024), $name); my $cmd = &$rbd_cmd($scfg, $storeid, 'create', '--image-format' , 2, '--size', int(($size+1023)/1024), $name);
run_rbd_command($cmd, errmsg => "rbd create $name' error"); run_rbd_command($cmd, errmsg => "rbd create $name' error");

2
PVE/Storage/SheepdogPlugin.pm
View File

@ -242,7 +242,7 @@ sub alloc_image {
die "illegal name '$name' - sould be 'vm-$vmid-*'\n" die "illegal name '$name' - sould be 'vm-$vmid-*'\n"
if $name && $name !~ m/^vm-$vmid-/; if $name && $name !~ m/^vm-$vmid-/;
$name = &$find_free_diskname($storeid, $scfg, $vmid); $name = &$find_free_diskname($storeid, $scfg, $vmid) if !$name;
my $cmd = &$collie_cmd($scfg, 'vdi', 'create', $name , "${size}k"); my $cmd = &$collie_cmd($scfg, 'vdi', 'create', $name , "${size}k");

2
PVE/Storage/ZFSPlugin.pm
View File

@ -478,7 +478,7 @@ sub alloc_image {
die "illegal name '$name' - sould be 'vm-$vmid-*'\n" die "illegal name '$name' - sould be 'vm-$vmid-*'\n"
if $name && $name !~ m/^vm-$vmid-/; if $name && $name !~ m/^vm-$vmid-/;
$name = &$find_free_diskname($storeid, $scfg, $vmid); $name = &$find_free_diskname($storeid, $scfg, $vmid) if !$name;
zfs_create_zvol($scfg, $name, $size); zfs_create_zvol($scfg, $name, $size);
my $guid = zfs_create_lu($scfg, $name); my $guid = zfs_create_lu($scfg, $name);