X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=PVE%2FStorage%2FRBDPlugin.pm;h=fab6d57592d5c918becd70ba15960ddf18df4fa2;hb=5b715fd9845dfd07e7ed5657706498bb137cb9e9;hp=60f69d1b4c593fff54adb41dd4453248b033584b;hpb=c693f74953e6ae1ceb9ab06d542b4d4892864ffc;p=pve-storage.git

diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm
index 60f69d1..fab6d57 100644
--- a/PVE/Storage/RBDPlugin.pm
+++ b/PVE/Storage/RBDPlugin.pm
@@ -2,21 +2,25 @@ package PVE::Storage::RBDPlugin;
 
 use strict;
 use warnings;
+
 use IO::File;
-use IO::Handle qw( );
-use PVE::Tools qw(run_command trim);
-use PVE::Storage::Plugin;
+use JSON;
+use Net::IP;
+
+use PVE::CephConfig;
 use PVE::JSONSchema qw(get_standard_option);
+use PVE::ProcFSTools;
+use PVE::RADOS;
+use PVE::Storage::Plugin;
+use PVE::Tools qw(run_command trim);
 
 use base qw(PVE::Storage::Plugin);
 
-sub rbd_unittobytes {
-  {
-       "M"  => 1024*1024,
-       "G"  => 1024*1024*1024,
-       "T"  => 1024*1024*1024*1024,
-  }
-}
+my $get_parent_image_name = sub {
+    my ($parent) = @_;
+    return undef if !$parent;
+    return $parent->{image} . "@" . $parent->{snapshot};
+};
 
 my $add_pool_to_disk = sub {
     my ($scfg, $disk) = @_;
@@ -26,25 +30,19 @@ my $add_pool_to_disk = sub {
     return "$pool/$disk";
 };
 
-my $rbd_cmd = sub {
-    my ($scfg, $storeid, $op, @options) = @_;
-
-    my $monhost = $scfg->{monhost};
-    $monhost =~ s/;/,/g;
+my $build_cmd = sub {
+    my ($binary, $scfg, $storeid, $op, @options) = @_;
 
-    my $keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
+    my $cmd_option = PVE::CephConfig::ceph_connect_option($scfg, $storeid);
     my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
-    my $username =  $scfg->{username} ? $scfg->{username} : 'admin';
 
-    my $cmd = ['/usr/bin/rbd', '-p', $pool, '-m', $monhost]; 
+    my $cmd = [$binary, '-p', $pool];
 
-    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, '-c', $cmd_option->{ceph_conf} if ($cmd_option->{ceph_conf});
+    push @$cmd, '-m', $cmd_option->{mon_host} if ($cmd_option->{mon_host});
+    push @$cmd, '--auth_supported', $cmd_option->{auth_supported} if ($cmd_option->{auth_supported});
+    push @$cmd, '-n', "client.$cmd_option->{userid}" if ($cmd_option->{userid});
+    push @$cmd, '--keyring', $cmd_option->{keyring} if ($cmd_option->{keyring});
 
     push @$cmd, $op;
 
@@ -53,31 +51,73 @@ my $rbd_cmd = sub {
     return $cmd;
 };
 
+my $rbd_cmd = sub {
+    my ($scfg, $storeid, $op, @options) = @_;
+
+    return $build_cmd->('/usr/bin/rbd', $scfg, $storeid, $op, @options);
+};
+
 my $rados_cmd = sub {
     my ($scfg, $storeid, $op, @options) = @_;
 
-    my $monhost = $scfg->{monhost};
-    $monhost =~ s/;/,/g;
+    return $build_cmd->('/usr/bin/rados', $scfg, $storeid, $op, @options);
+};
 
-    my $keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
-    my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
-    my $username =  $scfg->{username} ? $scfg->{username} : 'admin';
+my $librados_connect = sub {
+    my ($scfg, $storeid, $options) = @_;
 
-    my $cmd = ['/usr/bin/rados', '-p', $pool, '-m', $monhost];
+    my $librados_config = PVE::CephConfig::ceph_connect_option($scfg, $storeid);
 
-    if(-e $keyring){
-	push @$cmd, '-n', "client.$username";
-	push @$cmd, '--keyring', $keyring;
-	push @$cmd, '--auth_supported', 'cephx';
-    }else{
-	push @$cmd, '--auth_supported', 'none';
+    my $rados = PVE::RADOS->new(%$librados_config);
+
+    return $rados;
+};
+
+# needed for volumes created using ceph jewel (or higher)
+my $krbd_feature_update = sub {
+    my ($scfg, $storeid, $name) = @_;
+
+    my (@disable, @enable);
+    my ($kmajor, $kminor) = PVE::ProcFSTools::kernel_version();
+
+    if ($kmajor > 5 || $kmajor == 5 && $kminor >= 3) {
+	# 'deep-flatten' can only be disabled, not enabled after image creation
+	push @enable, 'fast-diff', 'object-map';
+    } else {
+	push @disable, 'fast-diff', 'object-map', 'deep-flatten';
     }
 
-    push @$cmd, $op;
+    if ($kmajor >= 5) {
+	push @enable, 'exclusive-lock';
+    } else {
+	push @disable, 'exclusive-lock';
+    }
 
-    push @$cmd, @options if scalar(@options);
+    my $active_features_list = (rbd_volume_info($scfg, $storeid, $name))[4];
+    my $active_features = { map { $_ => 1 } @$active_features_list };
 
-    return $cmd;
+    my $to_disable = join(',', grep {  $active_features->{$_} } @disable);
+    my $to_enable  = join(',', grep { !$active_features->{$_} } @enable );
+
+    if ($to_disable) {
+	print "disable RBD image features this kernel RBD drivers is not compatible with: $to_disable\n";
+	my $cmd = $rbd_cmd->($scfg, $storeid, 'feature', 'disable', $name, $to_disable);
+	run_rbd_command(
+	    $cmd,
+	    errmsg => "could not disable krbd-incompatible image features '$to_disable' for rbd image: $name",
+	);
+    }
+    if ($to_enable) {
+	print "enable RBD image features this kernel RBD drivers supports: $to_enable\n";
+	eval {
+	    my $cmd = $rbd_cmd->($scfg, $storeid, 'feature', 'enable', $name, $to_enable);
+	    run_rbd_command(
+		$cmd,
+		errmsg => "could not enable krbd-compatible image features '$to_enable' for rbd image: $name",
+	    );
+	};
+	warn "$@" if $@;
+    }
 };
 
 sub run_rbd_command {
@@ -85,54 +125,38 @@ sub run_rbd_command {
 
     my $lasterr;
     my $errmsg = $args{errmsg} . ": " || "";
-    if (!exists $args{errfunc}) {
+    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();
-			 };
+	    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;
     }
 
-    my $r;
-    eval {
-	$r = run_command($cmd, %args);
-    };
-
-    die $errmsg . $lasterr if $@ && length $lasterr;
-    die $@ if $@;
-
-    return $r;
+    return undef;
 }
 
 sub rbd_ls {
     my ($scfg, $storeid) = @_;
 
-    my $cmd = &$rbd_cmd($scfg, $storeid, 'ls', '-l');
+    my $cmd = &$rbd_cmd($scfg, $storeid, 'ls', '-l', '--format', 'json');
     my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
 
-    my $list = {};
-
-    my $parser = sub {
-	my $line = shift;
-
-	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->{$pool}->{$image} = {
-		name => $image,
-		size => $size*rbd_unittobytes()->{$unit},
-		parent => $parent,
-		vmid => $owner
-	    };
-	}
-    };
+    my $raw = '';
+    my $parser = sub { $raw .= shift };
 
     eval {
 	run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
@@ -140,82 +164,118 @@ sub rbd_ls {
     my $err = $@;
 
     die $err if $err && $err !~ m/doesn't contain rbd images/ ;
-  
-    return $list;
-}
 
-sub rbd_volume_info {
-    my ($scfg, $storeid, $volname, $snap) = @_;
+    my $result;
+    if ($raw eq '') {
+	$result = [];
+    } elsif ($raw =~ m/^(\[.*\])$/s) { # untaint
+	$result = JSON::decode_json($1);
+    } else {
+	die "got unexpected data from rbd ls: '$raw'\n";
+    }
 
-    my $cmd = undef;
+    my $list = {};
 
-    if($snap){
-       $cmd = &$rbd_cmd($scfg, $storeid, 'info', $volname, '--snap', $snap);
-    }else{
-       $cmd = &$rbd_cmd($scfg, $storeid, 'info', $volname);
+    foreach my $el (@$result) {
+	next if defined($el->{snapshot});
+
+	my $image = $el->{image};
+
+	my ($owner) = $image =~ m/^(?:vm|base)-(\d+)-/;
+	next if !defined($owner);
+
+	$list->{$pool}->{$image} = {
+	    name => $image,
+	    size => $el->{size},
+	    parent => $get_parent_image_name->($el->{parent}),
+	    vmid => $owner
+	};
     }
 
-    my $size = undef;
-    my $parent = undef;
-    my $format = undef;
-    my $protected = undef;
+    return $list;
+}
 
-    my $parser = sub {
-	my $line = shift;
+sub rbd_ls_snap {
+    my ($scfg, $storeid, $name) = @_;
 
-	if ($line =~ m/size (\d+) (M|G|T)B in (\d+) objects/) {
-	    $size = $1 * rbd_unittobytes()->{$2} if ($1);
-	} elsif ($line =~ m/parent:\s(\S+)\/(\S+)/) {
-	    $parent = $2;
-	} elsif ($line =~ m/format:\s(\d+)/) {
-	    $format = $1;
-	} elsif ($line =~ m/protected:\s(\S+)/) {
-	    $protected = 1 if $1 eq "True";
-	}
+    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; });
 
-    run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
+    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";
+    }
 
-    return ($size, $parent, $format, $protected);
+    $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 addslashes {
-    my $text = shift;
-    $text =~ s/;/\\;/g;
-    $text =~ s/:/\\:/g;
-    return $text;
-}
+sub rbd_volume_info {
+    my ($scfg, $storeid, $volname, $snap) = @_;
 
-# Configuration
+    my $cmd = undef;
 
-PVE::JSONSchema::register_format('pve-storage-monhost', \&parse_monhost);
-sub parse_monhost {
-    my ($name, $noerr) = @_;
+    my @options = ('info', $volname, '--format', 'json');
+    if ($snap) {
+	push @options, '--snap', $snap;
+    }
+
+    $cmd = &$rbd_cmd($scfg, $storeid, @options);
+
+    my $raw = '';
+    my $parser = sub { $raw .= shift };
+
+    run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
 
-    if ($name !~ m/^[a-z][a-z0-9\-\_\.]*[a-z0-9]$/i) {
-	return undef if $noerr;
-	die "lvm name '$name' contains illegal characters\n";
+    my $volume;
+    if ($raw eq '') {
+	$volume = {};
+    } elsif ($raw =~ m/^(\{.*\})$/s) { # untaint
+	$volume = JSON::decode_json($1);
+    } else {
+	die "got unexpected data from rbd info: '$raw'\n";
     }
 
-    return $name;
+    $volume->{parent} = $get_parent_image_name->($volume->{parent});
+    $volume->{protected} = defined($volume->{protected}) && $volume->{protected} eq "true" ? 1 : undef;
+
+    return $volume->@{qw(size parent format protected features)};
 }
 
+# Configuration
+
 sub type {
     return 'rbd';
 }
 
 sub plugindata {
     return {
-	content => [ {images => 1}, { images => 1 }],
+	content => [ {images => 1, rootdir => 1}, { images => 1 }],
     };
 }
 
 sub properties {
     return {
 	monhost => {
-	    description => "Monitors daemon ips.",
-	    type => 'string',
+	    description => "IP addresses of monitors (for external clusters).",
+	    type => 'string', format => 'pve-storage-portal-dns-list',
 	},
 	pool => {
 	    description => "Pool.",
@@ -229,6 +289,10 @@ sub properties {
 	    description => "Authsupported.",
 	    type => 'string',
 	},
+	krbd => {
+	    description => "Always access rbd through krbd kernel module.",
+	    type => 'boolean',
+	},
     };
 }
 
@@ -236,20 +300,42 @@ sub options {
     return {
 	nodes => { optional => 1 },
 	disable => { optional => 1 },
-	monhost => { fixed => 1 },
+	monhost => { optional => 1},
 	pool => { optional => 1 },
 	username => { optional => 1 },
 	content => { optional => 1 },
+	krbd => { optional => 1 },
+	bwlimit => { optional => 1 },
     };
 }
 
 # Storage implementation
 
+sub on_add_hook {
+    my ($class, $storeid, $scfg, %param) = @_;
+
+    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 {
+    my ($class, $storeid, $scfg) = @_;
+
+    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 {
     my ($class, $volname) = @_;
 
     if ($volname =~ m/^((base-(\d+)-\S+)\/)?((base)?(vm)?-(\d+)-\S+)$/) {
-	return ('images', $4, $7, $2, $3, $5);
+	return ('images', $4, $7, $2, $3, $5, 'raw');
     }
 
     die "unable to parse rbd volume name '$volname'\n";
@@ -258,48 +344,50 @@ sub parse_volname {
 sub path {
     my ($class, $scfg, $volname, $storeid, $snapname) = @_;
 
+    my $cmd_option = PVE::CephConfig::ceph_connect_option($scfg, $storeid);
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
     $name .= '@'.$snapname if $snapname;
 
-    my $monhost = addslashes($scfg->{monhost});
     my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
-    my $username =  $scfg->{username} ? $scfg->{username} : 'admin';
+    return ("/dev/rbd/$pool/$name", $vmid, $vtype) if $scfg->{krbd};
 
-    my $path = "rbd:$pool/$name:mon_host=$monhost";
-    my $keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
+    my $path = "rbd:$pool/$name";
 
-    if(-e $keyring ){
-        $path .= ":id=$username:auth_supported=cephx:keyring=$keyring";
-    }else{
-	$path .= ":auth_supported=none";
+    $path .= ":conf=$cmd_option->{ceph_conf}" if $cmd_option->{ceph_conf};
+    if (defined($scfg->{monhost})) {
+	my $monhost = PVE::CephConfig::hostlist($scfg->{monhost}, ';');
+	$monhost =~ s/:/\\:/g;
+	$path .= ":mon_host=$monhost";
+	$path .= ":auth_supported=$cmd_option->{auth_supported}";
     }
 
+    $path .= ":id=$cmd_option->{userid}:keyring=$cmd_option->{keyring}" if ($cmd_option->{keyring});
+
     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 $rbd = rbd_ls($scfg, $storeid);
-    my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
-    my $disk_ids = {};
-    my $dat = $rbd->{$pool};
+    my $cmd = &$rbd_cmd($scfg, $storeid, 'ls');
+    my $disk_list = [];
 
-    foreach my $image (keys %$dat) {
-	my $volname = $dat->{$image}->{name};
-	if ($volname =~ m/(vm|base)-$vmid-disk-(\d+)/){
-	    $disk_ids->{$2} = 1;
+    my $parser = sub {
+	my $line = shift;
+	if ($line =~ m/^(.*)$/) { # untaint
+	    push @$disk_list, $1;
 	}
-    }
-    #fix: can we search in $rbd hash key with a regex to find (vm|base) ?
-    for (my $i = 1; $i < 100; $i++) {
-        if (!$disk_ids->{$i}) {
-            return "vm-$vmid-disk-$i";
-        }
-    }
+    };
 
-    die "unable to allocate an image name for VM $vmid in storage '$storeid'\n";
-};
+    eval {
+	run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
+    };
+    my $err = $@;
+
+    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) = @_;
@@ -335,7 +423,7 @@ sub create_base {
 
     if (!$protected){
 	my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'protect', $newname, '--snap', $snap);
-	run_rbd_command($cmd, errmsg => "rbd protect $newname snap $snap' error");
+	run_rbd_command($cmd, errmsg => "rbd protect $newname snap '$snap' error");
     }
 
     return $newvolname;
@@ -343,22 +431,36 @@ 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);
+    my $name = $class->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', &$add_pool_to_disk($scfg, $basename), 
+			'--snap', $snap, &$add_pool_to_disk($scfg, $name));
 
-    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;
@@ -368,10 +470,10 @@ sub alloc_image {
     my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_;
 
 
-    die "illegal name '$name' - sould be 'vm-$vmid-*'\n"
+    die "illegal name '$name' - should be 'vm-$vmid-*'\n"
 	if  $name && $name !~ m/^vm-$vmid-/;
 
-    $name = &$find_free_diskname($storeid, $scfg, $vmid);
+    $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");
@@ -385,15 +487,16 @@ 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");
+	    run_rbd_command($cmd, errmsg => "rbd unprotect $name snap '$snap' error");
 	}
     }
 
+    $class->deactivate_volume($storeid, $scfg, $volname);
+
     my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'purge',  $name);
     run_rbd_command($cmd, errmsg => "rbd snap purge '$volname' error");
 
@@ -412,26 +515,31 @@ sub list_images {
     my $res = [];
 
     if (my $dat = $cache->{rbd}->{$pool}) {
-        foreach my $image (keys %$dat) {
+	foreach my $image (keys %$dat) {
+
+	    my $info = $dat->{$image};
 
-            my $volname = $dat->{$image}->{name};
+	    my $volname = $info->{name};
+	    my $parent = $info->{parent};
+	    my $owner = $info->{vmid};
 
-            my $volid = "$storeid:$volname";
+	    if ($parent && $parent =~ m/^(base-\d+-\S+)\@__base__$/) {
+		$info->{volid} = "$storeid:$1/$volname";
+	    } else {
+		$info->{volid} = "$storeid:$volname";
+	    }
 
-            my $owner = $dat->{$volname}->{vmid};
-            if ($vollist) {
-                my $found = grep { $_ eq $volid } @$vollist;
-                next if !$found;
-            } else {
-                next if defined ($vmid) && ($owner ne $vmid);
-            }
+	    if ($vollist) {
+		my $found = grep { $_ eq $info->{volid} } @$vollist;
+		next if !$found;
+	    } else {
+		next if defined ($vmid) && ($owner ne $vmid);
+	    }
 
-            my $info = $dat->{$volname};
-            $info->{volid} = $volid;
 	    $info->{format} = 'raw';
 
-            push @$res, $info;
-        }
+	    push @$res, $info;
+	}
     }
     
     return $res;
@@ -440,24 +548,17 @@ sub list_images {
 sub status {
     my ($class, $storeid, $scfg, $cache) = @_;
 
-    my $cmd = &$rados_cmd($scfg, $storeid, 'df');
 
-    my $stats = {};
-
-    my $parser = sub {
-	my $line = shift;
-	if ($line =~ m/^\s+total\s(\S+)\s+(\d+)/) {
-	    $stats->{$1} = $2;
-	}
-    };
+    my $rados = &$librados_connect($scfg, $storeid);
+    my $df = $rados->mon_command({ prefix => 'df', format => 'json' });
 
-    eval {
-	run_rbd_command($cmd, errmsg => "rados error", errfunc => sub {}, outfunc => $parser);
-    };
+    my ($d) = grep { $_->{name} eq $scfg->{pool} } @{$df->{pools}};
 
-    my $total = $stats->{space} ? $stats->{space}*1024 : 0;
-    my $free = $stats->{avail} ? $stats->{avail}*1024 : 0;
-    my $used = $stats->{used} ? $stats->{used}*1024: 0;
+    # max_avail -> max available space for data w/o replication in the pool
+    # bytes_used -> data w/o replication in the pool
+    my $free = $d->{stats}->{max_avail};
+    my $used = $d->{stats}->{stored} // $d->{stats}->{bytes_used};
+    my $total = $used + $free;
     my $active = 1;
 
     return ($total, $free, $used, $active);
@@ -473,13 +574,66 @@ sub deactivate_storage {
     return 1;
 }
 
+my $get_kernel_device_name = sub {
+    my ($pool, $name) = @_;
+
+    return "/dev/rbd/$pool/$name";
+};
+
+sub map_volume {
+    my ($class, $storeid, $scfg, $volname, $snapname) = @_;
+
+    my ($vtype, $img_name, $vmid) = $class->parse_volname($volname);
+
+    my $name = $img_name;
+    $name .= '@'.$snapname if $snapname;
+
+    my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
+
+    my $kerneldev = $get_kernel_device_name->($pool, $name);
+
+    return $kerneldev if -b $kerneldev; # already mapped
+
+    # features can only be enabled/disabled for image, not for snapshot!
+    $krbd_feature_update->($scfg, $storeid, $img_name);
+
+    my $cmd = &$rbd_cmd($scfg, $storeid, 'map', $name);
+    run_rbd_command($cmd, errmsg => "can't map rbd volume $name");
+
+    return $kerneldev;
+}
+
+sub unmap_volume {
+    my ($class, $storeid, $scfg, $volname, $snapname) = @_;
+
+    my ($vtype, $name, $vmid) = $class->parse_volname($volname);
+    $name .= '@'.$snapname if $snapname;
+
+    my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
+
+    my $kerneldev = $get_kernel_device_name->($pool, $name);
+
+    if (-b $kerneldev) {
+	my $cmd = &$rbd_cmd($scfg, $storeid, 'unmap', $kerneldev);
+	run_rbd_command($cmd, errmsg => "can't unmap rbd device $kerneldev");
+    }
+
+    return 1;
+}
+
 sub activate_volume {
-    my ($class, $storeid, $scfg, $volname, $exclusive, $cache) = @_;
+    my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_;
+
+    $class->map_volume($storeid, $scfg, $volname, $snapname) if $scfg->{krbd};
+
     return 1;
 }
 
 sub deactivate_volume {
-    my ($class, $storeid, $scfg, $volname, $exclusive, $cache) = @_;
+    my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_;
+
+    $class->unmap_volume($storeid, $scfg, $volname, $snapname);
+
     return 1;
 }
 
@@ -494,19 +648,17 @@ sub volume_size_info {
 sub volume_resize {
     my ($class, $scfg, $storeid, $volname, $size, $running) = @_;
 
-    return 1 if $running;
+    return 1 if $running && !$scfg->{krbd}; # FIXME???
 
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
 
-    my $cmd = &$rbd_cmd($scfg, $storeid, 'resize', '--size', ($size/1024/1024), $name);
+    my $cmd = &$rbd_cmd($scfg, $storeid, 'resize', '--allow-shrink', '--size', ($size/1024/1024), $name);
     run_rbd_command($cmd, errmsg => "rbd resize '$volname' error");
     return undef;
 }
 
 sub volume_snapshot {
-    my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
-
-    return 1 if $running;
+    my ($class, $scfg, $storeid, $volname, $snap) = @_;
 
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
 
@@ -521,16 +673,24 @@ sub volume_snapshot_rollback {
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
 
     my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'rollback', '--snap', $snap, $name);
-    run_rbd_command($cmd, errmsg => "rbd snapshot $volname to $snap' error");
+    run_rbd_command($cmd, errmsg => "rbd snapshot $volname to '$snap' error");
 }
 
 sub volume_snapshot_delete {
     my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
 
-    return 1 if $running;
+    return 1 if $running && !$scfg->{krbd}; # FIXME: ????
+
+    $class->deactivate_volume($storeid, $scfg, $volname, $snap, {});
 
     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_rbd_command($cmd, errmsg => "rbd snapshot '$volname' error");
@@ -538,14 +698,20 @@ 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) = @_;
 
    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},
+	sparseinit => { base => 1, current => 1},
     };
 
     my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =