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 e6259994ea454ef6735315514b9b3795e9cbe2ce..b3f9d20b39b7e603290ed6a414765b7062b42cfa 100644 (file)
--- a/PVE/Storage/RBDPlugin.pm
+++ b/PVE/Storage/RBDPlugin.pm
@@ -17,6 +17,14 @@ 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) = @_;
 
@@ -216,9 +224,10 @@ 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} ? $scfg->{pool} : 'rbd';
@@ -283,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 ?
 
@@ -294,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;
@@ -317,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;
 }
@@ -332,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;
 }
@@ -349,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;
 }
@@ -458,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;
 }
 
@@ -470,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;
 }
 
@@ -480,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 {
@@ -491,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;
 }