plugin : add volume_snapshot_rollback

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

diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm
index 83c67749651514b9e3ba5148326480934ac7f81f..7a2222e4d3e273a45f3405680d61e0931fac7a1b 100644 (file)
--- a/PVE/Storage/RBDPlugin.pm
+++ b/PVE/Storage/RBDPlugin.pm
@@ -9,32 +9,51 @@ use PVE::JSONSchema qw(get_standard_option);
 
 use base qw(PVE::Storage::Plugin);
 
+my $rbd_cmd = sub {
+    my ($scfg, $storeid, $op, @options) = @_;
 
-sub rbd_ls{
- my ($scfg, $storeid) = @_;
-
-    my $rbdpool = $scfg->{pool};
     my $monhost = $scfg->{monhost};
     $monhost =~ s/;/,/g;
 
-    my $cmd = ['/usr/bin/rbd', '-p', $rbdpool, '-m', $monhost, '-n', "client.".$scfg->{username} ,'--keyfile', '/etc/pve/priv/ceph/'.$storeid.'.'.$scfg->{username}.'.key', '--auth_supported',$scfg->{authsupported}, 'ls' ];
+    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];
+
+    push @$cmd, @options if scalar(@options);
+
+    return $cmd;
+};
+
+sub rbd_ls {
+    my ($scfg, $storeid) = @_;
+
+    my $cmd = &$rbd_cmd($scfg, $storeid, 'ls');
+
     my $list = {};
-    run_command($cmd, errfunc => sub {},outfunc => sub {
-        my $line = shift;
 
-        $line = trim($line);
-        my ($image) = $line;
-       
-        $list->{$rbdpool}->{$image} = {
-            name => $image,
-            size => "",
-        };
+    my $parser = sub {
+       my $line = shift;
 
-    });
+       if ($line =~ m/^(vm-(\d+)-\S+)$/) {
+           my ($image, $owner) = ($1, $2);
 
+           $list->{$scfg->{pool}}->{$image} = {
+               name => $image,
+               size => 0,
+               vmid => $owner
+           };
+       }
+    };
 
-    return $list;
+    eval {
+       run_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
+    };
+    my $err = $@;
 
+    die $err if $err && $err !~ m/doesn't contain rbd images/ ;
+  
+    return $list;
 }
 
 sub addslashes {
@@ -58,7 +77,6 @@ sub parse_monhost {
     return $name;
 }
 
-
 sub type {
     return 'rbd';
 }
@@ -92,10 +110,12 @@ sub properties {
 
 sub options {
     return {
+       nodes => { optional => 1 },
+       disable => { optional => 1 },
        monhost => { fixed => 1 },
-        pool => { fixed => 1 },
+       pool => { fixed => 1 },
        username => { fixed => 1 },
-        authsupported => { fixed => 1 },
+       authsupported => { fixed => 1 },
        content => { optional => 1 },
     };
 }
@@ -122,7 +142,7 @@ sub path {
     my $username = $scfg->{username};
     my $authsupported = addslashes($scfg->{authsupported});
     
-    my $path = "rbd:$pool/$name:id=$username:auth_supported=$authsupported:keyfile=/etc/pve/priv/ceph/$storeid.$username.key:mon_host=$monhost";
+    my $path = "rbd:$pool/$name:id=$username:auth_supported=$authsupported:keyring=/etc/pve/priv/ceph/$storeid.keyring:mon_host=$monhost";
 
     return ($path, $vmid, $vtype);
 }
@@ -133,16 +153,13 @@ sub alloc_image {
 
     die "illegal name '$name' - sould be 'vm-$vmid-*'\n"
        if  $name && $name !~ m/^vm-$vmid-/;
-    my $rbdpool = $scfg->{pool};
-    my $monhost = $scfg->{monhost};
-    $monhost =~ s/;/,/g;
 
     if (!$name) {
        my $rdb = rbd_ls($scfg, $storeid);
 
        for (my $i = 1; $i < 100; $i++) {
            my $tn = "vm-$vmid-disk-$i";
-           if (!defined ($rdb->{$rbdpool}->{$tn})) {
+           if (!defined ($rdb->{$scfg->{pool}}->{$tn})) {
                $name = $tn;
                last;
            }
@@ -152,8 +169,8 @@ sub alloc_image {
     die "unable to allocate an image name for VM $vmid in storage '$storeid'\n"
        if !$name;
 
-    my $cmd = ['/usr/bin/rbd', '-p', $rbdpool, '-m', $monhost, '-n', "client.".$scfg->{username}, '--keyfile','/etc/pve/priv/ceph/'.$storeid.'.'.$scfg->{username}.'.key','--auth_supported', $scfg->{authsupported}, 'create', '--size', ($size/1024), $name  ];
-    run_command($cmd, errmsg => "rbd create $name' error");
+    my $cmd = &$rbd_cmd($scfg, $storeid, 'create', '--size', ($size/1024), $name);
+    run_command($cmd, errmsg => "rbd create $name' error", errfunc => sub {});
 
     return $name;
 }
@@ -161,12 +178,8 @@ sub alloc_image {
 sub free_image {
     my ($class, $storeid, $scfg, $volname) = @_;
 
-    my $rbdpool = $scfg->{pool};
-    my $monhost = $scfg->{monhost};
-    $monhost =~ s/;/,/g;
-
-    my $cmd = ['/usr/bin/rbd', '-p', $rbdpool, '-m', $monhost, '-n', "client.".$scfg->{username}, '--keyfile','/etc/pve/priv/ceph/'.$storeid.'.'.$scfg->{username}.'.key','--auth_supported',$scfg->{authsupported}, 'rm', $volname  ];
-    run_command($cmd, errmsg => "rbd rm $volname' error");
+    my $cmd = &$rbd_cmd($scfg, $storeid, 'rm', $volname);
+    run_command($cmd, errmsg => "rbd rm $volname' error", outfunc => sub {}, errfunc => sub {});
 
     return undef;
 }
@@ -175,17 +188,16 @@ sub list_images {
     my ($class, $storeid, $scfg, $vmid, $vollist, $cache) = @_;
 
     $cache->{rbd} = rbd_ls($scfg, $storeid) if !$cache->{rbd};
-    my $rbdpool = $scfg->{pool};
+
     my $res = [];
 
-    if (my $dat = $cache->{rbd}->{$rbdpool}) {
+    if (my $dat = $cache->{rbd}->{$scfg->{pool}}) {
         foreach my $image (keys %$dat) {
 
             my $volname = $dat->{$image}->{name};
 
             my $volid = "$storeid:$volname";
 
-
             my $owner = $dat->{$volname}->{vmid};
             if ($vollist) {
                 my $found = grep { $_ eq $volid } @$vollist;
@@ -196,15 +208,15 @@ sub list_images {
 
             my $info = $dat->{$volname};
             $info->{volid} = $volid;
+           $info->{format} = 'raw';
 
             push @$res, $info;
         }
     }
     
-   return $res;
+    return $res;
 }
 
-
 sub status {
     my ($class, $storeid, $scfg, $cache) = @_;
 
@@ -212,9 +224,8 @@ sub status {
     my $free = 0;
     my $used = 0;
     my $active = 1;
-    return ($total,$free,$used,$active);
 
-    return undef;
+    return ($total, $free, $used, $active);
 }
 
 sub activate_storage {
@@ -237,4 +248,44 @@ sub deactivate_volume {
     return 1;
 }
 
+sub volume_size_info {
+    my ($class, $scfg, $storeid, $volname, $timeout) = @_;
+
+    my $cmd = &$rbd_cmd($scfg, $storeid, 'info', $volname);
+    my $size = undef;
+    my $parser = sub {
+        my $line = shift;
+
+        if ($line =~ m/size (\d+) MB in (\d+) objects/) {
+            $size = $1;
+        }
+    };
+
+    run_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
+
+    $size = $size*1024*1024 if $size;
+
+    return $size;
+}
+
+sub volume_resize {
+    my ($class, $scfg, $storeid, $volname, $size, $running) = @_;
+
+    return 1 if $running;
+
+    my $cmd = &$rbd_cmd($scfg, $storeid, 'resize', '--size', ($size/1024/1024), $volname);
+    run_command($cmd, errmsg => "rbd resize $volname' error", errfunc => sub {});
+    return undef;
+}
+
+sub volume_snapshot {
+    my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
+
+    return 1 if $running;
+
+    my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'create', '--snap', $snap, $volname);
+    run_command($cmd, errmsg => "rbd snapshot $volname' error", errfunc => sub {});
+    return undef;
+}
+
 1;