rbd: monhost string : escape only ":" character

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

diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm
index 3340195fc76f0258a871ce8859bc77a2898dc4c7..2c45a68dc09871721c9a6074b963e8de1624eb5b 100644 (file)
--- a/PVE/Storage/RBDPlugin.pm
+++ b/PVE/Storage/RBDPlugin.pm
@@ -79,6 +79,35 @@ my $rados_cmd = sub {
     return $cmd;
 };
 
+sub run_rbd_command {
+    my ($cmd, %args) = @_;
+
+    my $lasterr;
+    my $errmsg = $args{errmsg} . ": " || "";
+    if (!exists($args{errfunc})) {
+       # ' error: 2014-02-06 11:51:59.839135 7f09f94d0760 -1 librbd: snap_unprotect: can't unprotect;
+       # at least 1 child(ren) in pool cephstor1
+       $args{errfunc} = sub {
+           my $line = shift;
+           if ($line =~ m/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]+ [\-\d]+ librbd: (.*)$/) {
+               $lasterr = "$1\n";
+           } else {
+               $lasterr = $line;
+           }
+           print STDERR $lasterr;
+           *STDERR->flush();
+       };
+    }
+    
+    eval { run_command($cmd, %args); };
+    if (my $err = $@) {
+       die $errmsg . $lasterr if length($lasterr);
+       die $err;
+    }
+
+    return undef;
+}
+
 sub rbd_ls {
     my ($scfg, $storeid) = @_;
 
@@ -103,7 +132,7 @@ sub rbd_ls {
     };
 
     eval {
-       run_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
+       run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
     };
     my $err = $@;
 
@@ -143,18 +172,11 @@ sub rbd_volume_info {
 
     };
 
-    run_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
+    run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
 
     return ($size, $parent, $format, $protected);
 }
 
-sub addslashes {
-    my $text = shift;
-    $text =~ s/;/\\;/g;
-    $text =~ s/:/\\:/g;
-    return $text;
-}
-
 # Configuration
 
 PVE::JSONSchema::register_format('pve-storage-monhost', \&parse_monhost);
@@ -224,11 +246,14 @@ 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 = $scfg->{monhost};
+    $monhost =~ s/:/\\:/g;
 
-    my $monhost = addslashes($scfg->{monhost});
     my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
     my $username =  $scfg->{username} ? $scfg->{username} : 'admin';
 
@@ -292,7 +317,7 @@ sub create_base {
     my $newvolname = $basename ? "$basename/$newname" : "$newname";
 
     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", errfunc => sub {});
+    run_rbd_command($cmd, errmsg => "rbd rename '$name' error");
 
     my $running  = undef; #fixme : is create_base always offline ?
 
@@ -302,7 +327,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_rbd_command($cmd, errmsg => "rbd protect $newname snap '$snap' error");
     }
 
     return $newvolname;
@@ -310,23 +335,37 @@ sub create_base {
 }
 
 sub clone_image {
-    my ($class, $scfg, $storeid, $volname, $vmid) = @_;
+    my ($class, $scfg, $storeid, $volname, $vmid, $snapname) = @_;
 
     my $snap = '__base__';
+    $snap = $snapname if length $snapname;
 
     my ($vtype, $basename, $basevmid, undef, undef, $isBase) =
         $class->parse_volname($volname);
 
-    die "clone_image onyl works on base images\n" if !$isBase;
+    die "$volname is not a base image and snapname is not provided\n" 
+       if !$isBase && !length($snapname);
 
     my $name = &$find_free_diskname($storeid, $scfg, $vmid);
 
-    warn "clone $volname: $basename to $name\n";
+    warn "clone $volname: $basename snapname $snap to $name\n";
+
+    if (length($snapname)) {
+       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);
+           run_rbd_command($cmd, errmsg => "rbd protect $volname snap $snapname error");
+       }
+    }
 
     my $newvol = "$basename/$name";
+    $newvol = $name if length($snapname);
 
-    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_rbd_command($cmd, errmsg => "rbd clone '$basename' error");
 
     return $newvol;
 }
@@ -338,10 +377,10 @@ sub alloc_image {
     die "illegal name '$name' - sould be 'vm-$vmid-*'\n"
        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', '--format' , 2, '--size', int(($size+1023)/1024), $name);
-    run_command($cmd, errmsg => "rbd create $name' error", errfunc => sub {});
+    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;
 }
@@ -357,15 +396,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_rbd_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_rbd_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_rbd_command($cmd, errmsg => "rbd rm '$volname' error");
 
     return undef;
 }
@@ -419,7 +458,7 @@ sub status {
     };
 
     eval {
-       run_command($cmd, errmsg => "rados error", errfunc => sub {}, outfunc => $parser);
+       run_rbd_command($cmd, errmsg => "rados error", errfunc => sub {}, outfunc => $parser);
     };
 
     my $total = $stats->{space} ? $stats->{space}*1024 : 0;
@@ -466,7 +505,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_rbd_command($cmd, errmsg => "rbd resize '$volname' error");
     return undef;
 }
 
@@ -478,7 +517,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_rbd_command($cmd, errmsg => "rbd snapshot '$volname' error");
     return undef;
 }
 
@@ -488,7 +527,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_rbd_command($cmd, errmsg => "rbd snapshot $volname to '$snap' error");
 }
 
 sub volume_snapshot_delete {
@@ -498,8 +537,16 @@ sub volume_snapshot_delete {
 
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
 
+    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_rbd_command($cmd, errmsg => "rbd unprotect $name snap '$snap' error");
+    }
+
     my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'rm', '--snap', $snap, $name);
-    run_command($cmd, errmsg => "rbd snapshot $volname' error", errfunc => sub {});
+
+    run_rbd_command($cmd, errmsg => "rbd snapshot '$volname' error");
+
     return undef;
 }
 
@@ -508,7 +555,7 @@ sub volume_has_feature {
 
    my $features = {
        snapshot => { current => 1, snap => 1},
-       clone => { base => 1},
+       clone => { base => 1, snap => 1},
        template => { current => 1},
        copy => { base => 1, current => 1, snap => 1},
     };