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

rbd: use private sub for get_rbd_path

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2021-04-09 13:39:32 +02:00
parent 9f3d6f3bb9
commit 4cf696f66e
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
PVE/Storage/RBDPlugin.pm
View File

@ -22,11 +22,12 @@ my $get_parent_image_name = sub {
return $parent->{image} . "@" . $parent->{snapshot}; return $parent->{image} . "@" . $parent->{snapshot};
}; };
my $get_rbd_path = sub { my sub get_rbd_path {
my ($scfg, $volume) = @_; my ($scfg, $volume) = @_;
my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd'; my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
my $namespace = $scfg->{namespace};
return "${pool}/$scfg->{namespace}/${volume}" if defined($scfg->{namespace}); return "${pool}/${namespace}/${volume}" if defined($namespace);
return "${pool}/${volume}"; return "${pool}/${volume}";
}; };
@ -362,7 +363,7 @@ sub path {
my ($vtype, $name, $vmid) = $class->parse_volname($volname); my ($vtype, $name, $vmid) = $class->parse_volname($volname);
$name .= '@'.$snapname if $snapname; $name .= '@'.$snapname if $snapname;
my $rbd_path = &$get_rbd_path($scfg, $name); my $rbd_path = get_rbd_path($scfg, $name);
return ("/dev/rbd/${rbd_path}", $vmid, $vtype) if $scfg->{krbd}; return ("/dev/rbd/${rbd_path}", $vmid, $vtype) if $scfg->{krbd};
my $path = "rbd:${rbd_path}"; my $path = "rbd:${rbd_path}";
@ -431,8 +432,8 @@ sub create_base {
$scfg, $scfg,
$storeid, $storeid,
'rename', 'rename',
&$get_rbd_path($scfg, $name), get_rbd_path($scfg, $name),
&$get_rbd_path($scfg, $newname), get_rbd_path($scfg, $newname),
); );
run_rbd_command($cmd, errmsg => "rbd rename '$name' error"); run_rbd_command($cmd, errmsg => "rbd rename '$name' error");
@ -483,10 +484,10 @@ sub clone_image {
$scfg, $scfg,
$storeid, $storeid,
'clone', 'clone',
&$get_rbd_path($scfg, $basename), get_rbd_path($scfg, $basename),
'--snap', '--snap',
$snap, $snap,
&$get_rbd_path($scfg, $name), get_rbd_path($scfg, $name),
); );
run_rbd_command($cmd, errmsg => "rbd clone '$basename' error"); run_rbd_command($cmd, errmsg => "rbd clone '$basename' error");
@ -606,9 +607,7 @@ sub deactivate_storage {
my $get_kernel_device_name = sub { my $get_kernel_device_name = sub {
my ($scfg, $name) = @_; my ($scfg, $name) = @_;
return "/dev/rbd/" . get_rbd_path($scfg, $name);
my $rbd_path = &$get_rbd_path($scfg, $name);
return "/dev/rbd/${rbd_path}";
}; };
sub map_volume { sub map_volume {