drbd: comment that the builtin plugin is depreacated

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

diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm
index 538d6bbc9c5526396c1f99cafb12c6c8b46b7289..fab6d57592d5c918becd70ba15960ddf18df4fa2 100644 (file)
--- a/PVE/Storage/RBDPlugin.pm
+++ b/PVE/Storage/RBDPlugin.pm
@@ -77,9 +77,6 @@ my $librados_connect = sub {
 my $krbd_feature_update = sub {
     my ($scfg, $storeid, $name) = @_;
 
-    my ($versionparts) = ceph_version();
-    return 1 if $versionparts->[0] < 10;
-
     my (@disable, @enable);
     my ($kmajor, $kminor) = PVE::ProcFSTools::kernel_version();
 
@@ -123,35 +120,6 @@ my $krbd_feature_update = sub {
     }
 };
 
-my $ceph_version_parser = sub {
-    my $ceph_version = shift;
-    # FIXME this is the same as pve-manager PVE::Ceph::Tools get_local_version
-    if ($ceph_version =~ /^ceph.*\s(\d+(?:\.\d+)+(?:-pve\d+)?)\s+(?:\(([a-zA-Z0-9]+)\))?/) {
-       my ($version, $buildcommit) = ($1, $2);
-       my $subversions = [ split(/\.|-/, $version) ];
-
-       return ($subversions, $version, $buildcommit);
-    }
-    warn "Could not parse Ceph version: '$ceph_version'\n";
-};
-
-sub ceph_version {
-    my ($cache) = @_;
-
-    my $version_string = $cache;
-    if (!defined($version_string)) {
-       run_command('ceph --version', outfunc => sub {
-           $version_string = shift;
-       });
-    }
-    return undef if !defined($version_string);
-    # subversion is an array ref. with the version parts from major to minor
-    # version is the filtered version string
-    my ($subversions, $version) = $ceph_version_parser->($version_string);
-
-    return wantarray ? ($subversions, $version) : $version;
-}
-
 sub run_rbd_command {
     my ($cmd, %args) = @_;
 
@@ -227,6 +195,38 @@ sub rbd_ls {
     return $list;
 }
 
+sub rbd_ls_snap {
+    my ($scfg, $storeid, $name) = @_;
+
+    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; });
+
+    my $list;
+    if ($raw =~ m/^(\[.*\])$/s) { # untaint
+       $list = eval { JSON::decode_json($1) };
+       die "invalid JSON output from 'rbd snap ls $name': $@\n" if $@;
+    } else {
+       die "got unexpected data from 'rbd snap ls $name': '$raw'\n";
+    }
+
+    $list = [] if !defined($list);
+
+    my $res = {};
+    foreach my $el (@$list) {
+       my $snap = $el->{name};
+       my $protected = defined($el->{protected}) && $el->{protected} eq "true" ? 1 : undef;
+       $res->{$snap} = {
+           name => $snap,
+           id => $el->{id} // undef,
+           size => $el->{size} // 0,
+           protected => $protected,
+       };
+    }
+    return $res;
+}
+
 sub rbd_volume_info {
     my ($scfg, $storeid, $volname, $snap) = @_;
 
@@ -317,6 +317,8 @@ sub on_add_hook {
     return if defined($scfg->{monhost}); # nothing to do if not pve managed ceph
 
     PVE::CephConfig::ceph_create_keyfile($scfg->{type}, $storeid);
+
+    return;
 }
 
 sub on_delete_hook {
@@ -325,6 +327,8 @@ sub on_delete_hook {
     return if defined($scfg->{monhost}); # nothing to do if not pve managed ceph
 
     PVE::CephConfig::ceph_remove_keyfile($scfg->{type}, $storeid);
+
+    return;
 }
 
 sub parse_volname {
@@ -362,8 +366,8 @@ sub path {
     return ($path, $vmid, $vtype);
 }
 
-my $find_free_diskname = sub {
-    my ($storeid, $scfg, $vmid) = @_;
+sub find_free_diskname {
+    my ($class, $storeid, $scfg, $vmid, $fmt, $add_fmt_suffix) = @_;
 
     my $cmd = &$rbd_cmd($scfg, $storeid, 'ls');
     my $disk_list = [];
@@ -383,7 +387,7 @@ my $find_free_diskname = sub {
     die $err if $err && $err !~ m/doesn't contain rbd images/;
 
     return PVE::Storage::Plugin::get_next_vm_diskname($disk_list, $storeid, $vmid, undef, $scfg);
-};
+}
 
 sub create_base {
     my ($class, $storeid, $scfg, $volname) = @_;
@@ -438,7 +442,7 @@ sub clone_image {
     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);
+    my $name = $class->find_free_diskname($storeid, $scfg, $vmid);
 
     warn "clone $volname: $basename snapname $snap to $name\n";
 
@@ -469,7 +473,7 @@ sub alloc_image {
     die "illegal name '$name' - should be 'vm-$vmid-*'\n"
        if  $name && $name !~ m/^vm-$vmid-/;
 
-    $name = $find_free_diskname->($storeid, $scfg, $vmid) if !$name;
+    $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);
     run_rbd_command($cmd, errmsg => "rbd create $name' error");
@@ -483,10 +487,9 @@ sub free_image {
     my ($vtype, $name, $vmid, undef, undef, undef) =
        $class->parse_volname($volname);
 
-    if ($isBase) {
-       my $snap = '__base__';
-       my (undef, undef, undef, $protected) = rbd_volume_info($scfg, $storeid, $name, $snap);
-       if ($protected){
+    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);
            run_rbd_command($cmd, errmsg => "rbd unprotect $name snap '$snap' error");
        }
@@ -695,6 +698,11 @@ sub volume_snapshot_delete {
     return undef;
 }
 
+sub volume_snapshot_needs_fsfreeze {
+
+    return 1;
+}
+
 sub volume_has_feature {
     my ($class, $scfg, $feature, $storeid, $volname, $snapname, $running) = @_;