be more verebose on rbd commands to get progress

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

diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm
index dfc51b71f83849579db00360dccb8e8b4a534aa1..b3f9d20b39b7e603290ed6a414765b7062b42cfa 100644 (file)
--- a/PVE/Storage/RBDPlugin.pm
+++ b/PVE/Storage/RBDPlugin.pm
@@ -17,16 +17,35 @@ sub rbd_unittobytes {
   }
 }
 
+my $add_pool_to_disk = sub {
+    my ($scfg, $disk) = @_;
+
+    my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
+
+    return "$pool/$disk";
+};
+
 my $rbd_cmd = sub {
     my ($scfg, $storeid, $op, @options) = @_;
 
     my $monhost = $scfg->{monhost};
     $monhost =~ s/;/,/g;
 
-    my $cmd = ['/usr/bin/rbd', '-p', $scfg->{pool}, '-m', $monhost, '-n', 
-              "client.$scfg->{username}", 
-              '--keyring', "/etc/pve/priv/ceph/${storeid}.keyring", 
-              '--auth_supported', $scfg->{authsupported}, $op];
+    my $keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
+    my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
+    my $username =  $scfg->{username} ? $scfg->{username} : 'admin';
+
+    my $cmd = ['/usr/bin/rbd', '-p', $pool, '-m', $monhost]; 
+
+    if(-e $keyring){
+       push @$cmd, '-n', "client.$username";
+       push @$cmd, '--keyring', $keyring;
+       push @$cmd, '--auth_supported', 'cephx';
+    }else{
+       push @$cmd, '--auth_supported', 'none';
+    }
+
+    push @$cmd, $op;
 
     push @$cmd, @options if scalar(@options);
 
@@ -39,10 +58,21 @@ my $rados_cmd = sub {
     my $monhost = $scfg->{monhost};
     $monhost =~ s/;/,/g;
 
-    my $cmd = ['/usr/bin/rados', '-p', $scfg->{pool}, '-m', $monhost, '-n', 
-              "client.$scfg->{username}", 
-              '--keyring', "/etc/pve/priv/ceph/${storeid}.keyring", 
-              '--auth_supported', $scfg->{authsupported}, $op];
+    my $keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
+    my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
+    my $username =  $scfg->{username} ? $scfg->{username} : 'admin';
+
+    my $cmd = ['/usr/bin/rados', '-p', $pool, '-m', $monhost];
+
+    if(-e $keyring){
+       push @$cmd, '-n', "client.$username";
+       push @$cmd, '--keyring', $keyring;
+       push @$cmd, '--auth_supported', 'cephx';
+    }else{
+       push @$cmd, '--auth_supported', 'none';
+    }
+
+    push @$cmd, $op;
 
     push @$cmd, @options if scalar(@options);
 
@@ -53,6 +83,7 @@ sub rbd_ls {
     my ($scfg, $storeid) = @_;
 
     my $cmd = &$rbd_cmd($scfg, $storeid, 'ls', '-l');
+    my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
 
     my $list = {};
 
@@ -62,7 +93,7 @@ sub rbd_ls {
        if ($line =~  m/^((vm|base)-(\d+)-disk-\d+)\s+(\d+)(M|G|T)\s((\S+)\/((vm|base)-\d+-\S+@\S+))?/) {
            my ($image, $owner, $size, $unit, $parent) = ($1, $3, $4, $5, $8);
 
-           $list->{$scfg->{pool}}->{$image} = {
+           $list->{$pool}->{$image} = {
                name => $image,
                size => $size*rbd_unittobytes()->{$unit},
                parent => $parent,
@@ -174,9 +205,8 @@ sub options {
        nodes => { optional => 1 },
        disable => { optional => 1 },
        monhost => { fixed => 1 },
-       pool => { fixed => 1 },
-       username => { fixed => 1 },
-       authsupported => { fixed => 1 },
+       pool => { optional => 1 },
+       username => { optional => 1 },
        content => { optional => 1 },
     };
 }
@@ -194,16 +224,23 @@ sub parse_volname {
 }
 
 sub path {
-    my ($class, $scfg, $volname, $storeid) = @_;
+    my ($class, $scfg, $volname, $storeid, $snapname) = @_;
 
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
+    $name .= '@'.$snapname if $snapname;
 
     my $monhost = addslashes($scfg->{monhost});
-    my $pool = $scfg->{pool};
-    my $username = $scfg->{username};
-    my $authsupported = addslashes($scfg->{authsupported});
-    
-    my $path = "rbd:$pool/$name:id=$username:auth_supported=$authsupported:keyring=/etc/pve/priv/ceph/$storeid.keyring:mon_host=$monhost";
+    my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
+    my $username =  $scfg->{username} ? $scfg->{username} : 'admin';
+
+    my $path = "rbd:$pool/$name:mon_host=$monhost";
+    my $keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
+
+    if(-e $keyring ){
+        $path .= ":id=$username:auth_supported=cephx:keyring=$keyring";
+    }else{
+       $path .= ":auth_supported=none";
+    }
 
     return ($path, $vmid, $vtype);
 }
@@ -212,8 +249,9 @@ my $find_free_diskname = sub {
     my ($storeid, $scfg, $vmid) = @_;
 
     my $rbd = rbd_ls($scfg, $storeid);
+    my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
     my $disk_ids = {};
-    my $dat = $rbd->{$scfg->{pool}};
+    my $dat = $rbd->{$pool};
 
     foreach my $image (keys %$dat) {
        my $volname = $dat->{$image}->{name};
@@ -254,8 +292,8 @@ sub create_base {
 
     my $newvolname = $basename ? "$basename/$newname" : "$newname";
 
-    my $cmd = &$rbd_cmd($scfg, $storeid, 'rename', $name, $newname);
-    run_command($cmd, errmsg => "rbd rename $name' error", errfunc => sub {});
+    my $cmd = &$rbd_cmd($scfg, $storeid, 'rename', &$add_pool_to_disk($scfg, $name), &$add_pool_to_disk($scfg, $newname));
+    run_command($cmd, errmsg => "rbd rename '$name' error");
 
     my $running  = undef; #fixme : is create_base always offline ?
 
@@ -265,7 +303,7 @@ sub create_base {
 
     if (!$protected){
        my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'protect', $newname, '--snap', $snap);
-       run_command($cmd, errmsg => "rbd protect $newname snap $snap' error", errfunc => sub {});
+       run_command($cmd, errmsg => "rbd protect $newname snap $snap' error");
     }
 
     return $newvolname;
@@ -288,8 +326,8 @@ sub clone_image {
 
     my $newvol = "$basename/$name";
 
-    my $cmd = &$rbd_cmd($scfg, $storeid, 'clone', $basename, '--snap', $snap, $name);
-    run_command($cmd, errmsg => "rbd clone $basename' error", errfunc => sub {});
+    my $cmd = &$rbd_cmd($scfg, $storeid, 'clone', &$add_pool_to_disk($scfg, $basename), '--snap', $snap, &$add_pool_to_disk($scfg, $name));
+    run_command($cmd, errmsg => "rbd clone $basename' error");
 
     return $newvol;
 }
@@ -303,8 +341,8 @@ sub alloc_image {
 
     $name = &$find_free_diskname($storeid, $scfg, $vmid);
 
-    my $cmd = &$rbd_cmd($scfg, $storeid, 'create', '--format' , 2, '--size', ($size/1024), $name);
-    run_command($cmd, errmsg => "rbd create $name' error", errfunc => sub {});
+    my $cmd = &$rbd_cmd($scfg, $storeid, 'create', '--format' , 2, '--size', int(($size+1023)/1024), $name);
+    run_command($cmd, errmsg => "rbd create $name' error");
 
     return $name;
 }
@@ -320,15 +358,15 @@ sub free_image {
        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 {});
+           run_command($cmd, errmsg => "rbd unprotect $name snap $snap' error");
        }
     }
 
     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");
 
     $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");
 
     return undef;
 }
@@ -337,10 +375,11 @@ sub list_images {
     my ($class, $storeid, $scfg, $vmid, $vollist, $cache) = @_;
 
     $cache->{rbd} = rbd_ls($scfg, $storeid) if !$cache->{rbd};
+    my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
 
     my $res = [];
 
-    if (my $dat = $cache->{rbd}->{$scfg->{pool}}) {
+    if (my $dat = $cache->{rbd}->{$pool}) {
         foreach my $image (keys %$dat) {
 
             my $volname = $dat->{$image}->{name};
@@ -428,7 +467,7 @@ sub volume_resize {
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
 
     my $cmd = &$rbd_cmd($scfg, $storeid, 'resize', '--size', ($size/1024/1024), $name);
-    run_command($cmd, errmsg => "rbd resize $volname' error", errfunc => sub {});
+    run_command($cmd, errmsg => "rbd resize $volname' error");
     return undef;
 }
 
@@ -440,7 +479,7 @@ sub volume_snapshot {
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
 
     my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'create', '--snap', $snap, $name);
-    run_command($cmd, errmsg => "rbd snapshot $volname' error", errfunc => sub {});
+    run_command($cmd, errmsg => "rbd snapshot $volname' error");
     return undef;
 }
 
@@ -450,7 +489,7 @@ sub volume_snapshot_rollback {
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
 
     my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'rollback', '--snap', $snap, $name);
-    run_command($cmd, errmsg => "rbd snapshot $volname to $snap' error", errfunc => sub {});
+    run_command($cmd, errmsg => "rbd snapshot $volname to $snap' error");
 }
 
 sub volume_snapshot_delete {
@@ -461,7 +500,7 @@ sub volume_snapshot_delete {
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
 
     my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'rm', '--snap', $snap, $name);
-    run_command($cmd, errmsg => "rbd snapshot $volname' error", errfunc => sub {});
+    run_command($cmd, errmsg => "rbd snapshot $volname' error");
     return undef;
 }