rbd: indentation and whitespace cleanups

[pve-storage.git] / PVE / Storage / RBDPlugin.pm

diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm
index 421539f165877aff357a8e3ce7956b770263f467..1566571e63376c58f2eeac81848a2dad9c82f314 100644 (file)
--- a/PVE/Storage/RBDPlugin.pm
+++ b/PVE/Storage/RBDPlugin.pm
@@ -22,9 +22,12 @@ my $get_parent_image_name = sub {
     return $parent->{image} . "@" . $parent->{snapshot};
 };
 
-my $get_rbd_path = sub {
+my sub get_rbd_path {
     my ($scfg, $volume) = @_;
     my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
+    my $namespace = $scfg->{namespace};
+
+    return "${pool}/${namespace}/${volume}" if defined($namespace);
     return "${pool}/${volume}";
 };
 
@@ -36,6 +39,13 @@ my $build_cmd = sub {
 
     my $cmd = [$binary, '-p', $pool];
 
+    if (defined(my $namespace = $scfg->{namespace})) {
+       # some subcommands will fail if the --namespace parameter is present
+       my $no_namespace_parameter = {
+           unmap => 1,
+       };
+       push @$cmd, '--namespace', "$namespace" if !$no_namespace_parameter->{$op};
+    }
     push @$cmd, '-c', $cmd_option->{ceph_conf} if ($cmd_option->{ceph_conf});
     push @$cmd, '-m', $cmd_option->{mon_host} if ($cmd_option->{mon_host});
     push @$cmd, '--auth_supported', $cmd_option->{auth_supported} if ($cmd_option->{auth_supported});
@@ -137,7 +147,7 @@ sub run_rbd_command {
            *STDERR->flush();
        };
     }
-    
+
     eval { run_command($cmd, %args); };
     if (my $err = $@) {
        die $errmsg . $lasterr if length($lasterr);
@@ -150,12 +160,13 @@ sub run_rbd_command {
 sub rbd_ls {
     my ($scfg, $storeid) = @_;
 
-    my $cmd = &$rbd_cmd($scfg, $storeid, 'ls', '-l', '--format', 'json');
     my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
+    $pool .= "/$scfg->{namespace}" if defined($scfg->{namespace});
 
     my $raw = '';
     my $parser = sub { $raw .= shift };
 
+    my $cmd = $rbd_cmd->($scfg, $storeid, 'ls', '-l', '--format', 'json');
     eval {
        run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
     };
@@ -196,7 +207,7 @@ sub rbd_ls {
 sub rbd_ls_snap {
     my ($scfg, $storeid, $name) = @_;
 
-    my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'ls', $name, '--format', 'json');
+    my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'ls', $name, '--format', 'json');
 
     my $raw = '';
     run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => sub { $raw .= shift; });
@@ -235,7 +246,7 @@ sub rbd_volume_info {
        push @options, '--snap', $snap;
     }
 
-    $cmd = &$rbd_cmd($scfg, $storeid, @options);
+    $cmd = $rbd_cmd->($scfg, $storeid, @options);
 
     my $raw = '';
     my $parser = sub { $raw .= shift };
@@ -279,6 +290,10 @@ sub properties {
            description => "Pool.",
            type => 'string',
        },
+       namespace => {
+           description => "RBD Namespace.",
+           type => 'string',
+       },
        username => {
            description => "RBD Id.",
            type => 'string',
@@ -300,6 +315,7 @@ sub options {
        disable => { optional => 1 },
        monhost => { optional => 1},
        pool => { optional => 1 },
+       namespace => { optional => 1 },
        username => { optional => 1 },
        content => { optional => 1 },
        krbd => { optional => 1 },
@@ -346,7 +362,7 @@ sub path {
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
     $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};
 
     my $path = "rbd:${rbd_path}";
@@ -367,7 +383,8 @@ sub path {
 sub find_free_diskname {
     my ($class, $storeid, $scfg, $vmid, $fmt, $add_fmt_suffix) = @_;
 
-    my $cmd = &$rbd_cmd($scfg, $storeid, 'ls');
+    my $cmd = $rbd_cmd->($scfg, $storeid, 'ls');
+
     my $disk_list = [];
 
     my $parser = sub {
@@ -410,12 +427,12 @@ sub create_base {
 
     my $newvolname = $basename ? "$basename/$newname" : "$newname";
 
-    my $cmd = &$rbd_cmd(
+    my $cmd = $rbd_cmd->(
        $scfg,
        $storeid,
        'rename',
-       &$get_rbd_path($scfg, $name),
-       &$get_rbd_path($scfg, $newname),
+       get_rbd_path($scfg, $name),
+       get_rbd_path($scfg, $newname),
     );
     run_rbd_command($cmd, errmsg => "rbd rename '$name' error");
 
@@ -426,7 +443,7 @@ sub create_base {
     my (undef, undef, undef, $protected) = rbd_volume_info($scfg, $storeid, $newname, $snap);
 
     if (!$protected){
-       my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'protect', $newname, '--snap', $snap);
+       my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'protect', $newname, '--snap', $snap);
        run_rbd_command($cmd, errmsg => "rbd protect $newname snap '$snap' error");
     }
 
@@ -454,7 +471,7 @@ sub clone_image {
        my (undef, undef, undef, $protected) = rbd_volume_info($scfg, $storeid, $volname, $snapname);
 
        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");
        }
     }
@@ -462,14 +479,14 @@ sub clone_image {
     my $newvol = "$basename/$name";
     $newvol = $name if length($snapname);
 
-    my $cmd = &$rbd_cmd(
+    my $cmd = $rbd_cmd->(
        $scfg,
        $storeid,
        'clone',
-       &$get_rbd_path($scfg, $basename),
+       get_rbd_path($scfg, $basename),
        '--snap',
        $snap,
-       &$get_rbd_path($scfg, $name),
+       get_rbd_path($scfg, $name),
     );
 
     run_rbd_command($cmd, errmsg => "rbd clone '$basename' error");
@@ -486,7 +503,7 @@ sub alloc_image {
 
     $name = $class->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");
 
     return $name;
@@ -498,20 +515,21 @@ sub free_image {
     my ($vtype, $name, $vmid, undef, undef, undef) =
        $class->parse_volname($volname);
 
+
     my $snaps = rbd_ls_snap($scfg, $storeid, $name);
     foreach my $snap (keys %$snaps) {
        if ($snaps->{$snap}->{protected}) {
-           my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'unprotect', $name, '--snap', $snap);
+           my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'unprotect', $name, '--snap', $snap);
            run_rbd_command($cmd, errmsg => "rbd unprotect $name snap '$snap' error");
        }
     }
 
     $class->deactivate_volume($storeid, $scfg, $volname);
 
-    my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'purge',  $name);
+    my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'purge',  $name);
     run_rbd_command($cmd, errmsg => "rbd snap purge '$volname' error");
 
-    $cmd = &$rbd_cmd($scfg, $storeid, 'rm', $name);
+    $cmd = $rbd_cmd->($scfg, $storeid, 'rm', $name);
     run_rbd_command($cmd, errmsg => "rbd rm '$volname' error");
 
     return undef;
@@ -522,6 +540,7 @@ sub list_images {
 
     $cache->{rbd} = rbd_ls($scfg, $storeid) if !$cache->{rbd};
     my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
+    $pool .= "/$scfg->{namespace}" if defined($scfg->{namespace});
 
     my $res = [];
 
@@ -559,8 +578,7 @@ sub list_images {
 sub status {
     my ($class, $storeid, $scfg, $cache) = @_;
 
-
-    my $rados = &$librados_connect($scfg, $storeid);
+    my $rados = $librados_connect->($scfg, $storeid);
     my $df = $rados->mon_command({ prefix => 'df', format => 'json' });
 
     my ($d) = grep { $_->{name} eq $scfg->{pool} } @{$df->{pools}};
@@ -585,11 +603,9 @@ sub deactivate_storage {
     return 1;
 }
 
-my $get_kernel_device_name = sub {
+my sub get_kernel_device_path {
     my ($scfg, $name) = @_;
-
-    my $rbd_path = &$get_rbd_path($scfg, $name);
-    return "/dev/rbd/${rbd_path}";
+    return "/dev/rbd/" . get_rbd_path($scfg, $name);
 };
 
 sub map_volume {
@@ -600,14 +616,14 @@ sub map_volume {
     my $name = $img_name;
     $name .= '@'.$snapname if $snapname;
 
-    my $kerneldev = $get_kernel_device_name->($scfg, $name);
+    my $kerneldev = get_kernel_device_path($scfg, $name);
 
     return $kerneldev if -b $kerneldev; # already mapped
 
     # features can only be enabled/disabled for image, not for snapshot!
     $krbd_feature_update->($scfg, $storeid, $img_name);
 
-    my $cmd = &$rbd_cmd($scfg, $storeid, 'map', $name);
+    my $cmd = $rbd_cmd->($scfg, $storeid, 'map', $name);
     run_rbd_command($cmd, errmsg => "can't map rbd volume $name");
 
     return $kerneldev;
@@ -619,10 +635,10 @@ sub unmap_volume {
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
     $name .= '@'.$snapname if $snapname;
 
-    my $kerneldev = $get_kernel_device_name->($scfg, $name);
+    my $kerneldev = get_kernel_device_path($scfg, $name);
 
     if (-b $kerneldev) {
-       my $cmd = &$rbd_cmd($scfg, $storeid, 'unmap', $kerneldev);
+       my $cmd = $rbd_cmd->($scfg, $storeid, 'unmap', $kerneldev);
        run_rbd_command($cmd, errmsg => "can't unmap rbd device $kerneldev");
     }
 
@@ -660,7 +676,7 @@ sub volume_resize {
 
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
 
-    my $cmd = &$rbd_cmd($scfg, $storeid, 'resize', '--allow-shrink', '--size', ($size/1024/1024), $name);
+    my $cmd = $rbd_cmd->($scfg, $storeid, 'resize', '--allow-shrink', '--size', ($size/1024/1024), $name);
     run_rbd_command($cmd, errmsg => "rbd resize '$volname' error");
     return undef;
 }
@@ -670,7 +686,7 @@ sub volume_snapshot {
 
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
 
-    my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'create', '--snap', $snap, $name);
+    my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'create', '--snap', $snap, $name);
     run_rbd_command($cmd, errmsg => "rbd snapshot '$volname' error");
     return undef;
 }
@@ -680,7 +696,7 @@ sub volume_snapshot_rollback {
 
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
 
-    my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'rollback', '--snap', $snap, $name);
+    my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'rollback', '--snap', $snap, $name);
     run_rbd_command($cmd, errmsg => "rbd snapshot $volname to '$snap' error");
 }
 
@@ -695,11 +711,11 @@ sub volume_snapshot_delete {
 
     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);
+       my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'unprotect', $name, '--snap', $snap);
        run_rbd_command($cmd, errmsg => "rbd unprotect $name snap '$snap' error");
     }
 
-    my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'rm', '--snap', $snap, $name);
+    my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'rm', '--snap', $snap, $name);
 
     run_rbd_command($cmd, errmsg => "rbd snapshot '$volname' error");
 
@@ -707,7 +723,6 @@ sub volume_snapshot_delete {
 }
 
 sub volume_snapshot_needs_fsfreeze {
-
     return 1;
 }
 
@@ -722,14 +737,13 @@ sub volume_has_feature {
        sparseinit => { base => 1, current => 1},
     };
 
-    my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
-        $class->parse_volname($volname);
+    my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) = $class->parse_volname($volname);
 
     my $key = undef;
-    if($snapname){
+    if ($snapname){
        $key = 'snap';
-    }else{
-       $key =  $isBase ? 'base' : 'current';
+    } else {
+       $key = $isBase ? 'base' : 'current';
     }
     return 1 if $features->{$feature}->{$key};