rbd: get_rbd_dev_path: return /dev/rbd path only if cluster matches

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

diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm
index 329356557c1a271543301e6648cc41fdf49ae3db..eeeaf3f51f03edb839f234657c6cbc35e1c76349 100644 (file)
--- a/PVE/Storage/RBDPlugin.pm
+++ b/PVE/Storage/RBDPlugin.pm
@@ -3,6 +3,7 @@ package PVE::Storage::RBDPlugin;
 use strict;
 use warnings;
 
+use Cwd qw(abs_path);
 use IO::File;
 use JSON;
 use Net::IP;
@@ -13,7 +14,7 @@ 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 PVE::Tools qw(run_command trim file_read_firstline);
 
 use base qw(PVE::Storage::Plugin);
 
@@ -45,7 +46,10 @@ my sub get_rbd_dev_path {
     my ($scfg, $storeid, $volume) = @_;
 
     my $cluster_id = '';
-    if ($scfg->{monhost}) {
+    if ($scfg->{fsid}) {
+       # NOTE: the config doesn't support this currently (but it could!), hack for qemu-server tests
+       $cluster_id = $scfg->{fsid};
+    } elsif ($scfg->{monhost}) {
        my $rados = $librados_connect->($scfg, $storeid);
        $cluster_id = $rados->mon_command({ prefix => 'fsid', format => 'json' })->{fsid};
     } else {
@@ -63,7 +67,13 @@ my sub get_rbd_dev_path {
     my $pve_path = "/dev/rbd-pve/${cluster_id}/${rbd_path}";
     my $path = "/dev/rbd/${rbd_path}";
 
-    return $path if -e $path && !-e $pve_path; # mapped before rbd-pve udev rule existed
+    if (!-e $pve_path && -e $path) {
+       # possibly mapped before rbd-pve rule existed
+       my $real_dev = abs_path($path);
+       my ($rbd_id) = ($real_dev =~ m|/dev/rbd([0-9]+)$|);
+       my $dev_cluster_id = file_read_firstline("/sys/devices/rbd/${rbd_id}/cluster_fsid");
+       return $path if $cluster_id eq $dev_cluster_id;
+    }
     return $pve_path;
 }
 
@@ -321,7 +331,7 @@ sub properties {
            type => 'string',
        },
        namespace => {
-           description => "RBD Namespace.",
+           description => "Namespace.",
            type => 'string',
        },
        username => {
@@ -482,6 +492,9 @@ sub create_base {
     );
     run_rbd_command($cmd, errmsg => "rbd rename '$name' error");
 
+    eval { $class->unmap_volume($storeid, $scfg, $volname); };
+    warn $@ if $@;
+
     my $running  = undef; #fixme : is create_base always offline ?
 
     $class->volume_snapshot($scfg, $storeid, $newname, $snap, $running);
@@ -624,7 +637,14 @@ sub status {
     my $rados = $librados_connect->($scfg, $storeid);
     my $df = $rados->mon_command({ prefix => 'df', format => 'json' });
 
-    my ($d) = grep { $_->{name} eq $scfg->{pool} } @{$df->{pools}};
+    my $pool = $scfg->{'data-pool'} // $scfg->{pool} // 'rbd';
+
+    my ($d) = grep { $_->{name} eq $pool } @{$df->{pools}};
+
+    if (!defined($d)) {
+       warn "could not get usage stats for pool '$pool'\n";
+       return;
+    }
 
     # max_avail -> max available space for data w/o replication in the pool
     # bytes_used -> data w/o replication in the pool
@@ -646,11 +666,6 @@ sub deactivate_storage {
     return 1;
 }
 
-my sub get_kernel_device_path {
-    my ($scfg, $storeid, $name) = @_;
-    return get_rbd_dev_path($scfg, $storeid, $name);
-};
-
 sub map_volume {
     my ($class, $storeid, $scfg, $volname, $snapname) = @_;
 
@@ -659,7 +674,7 @@ sub map_volume {
     my $name = $img_name;
     $name .= '@'.$snapname if $snapname;
 
-    my $kerneldev = get_kernel_device_path($scfg, $storeid, $name);
+    my $kerneldev = get_rbd_dev_path($scfg, $storeid, $name);
 
     return $kerneldev if -b $kerneldev; # already mapped
 
@@ -678,7 +693,7 @@ sub unmap_volume {
     my ($vtype, $name, $vmid) = $class->parse_volname($volname);
     $name .= '@'.$snapname if $snapname;
 
-    my $kerneldev = get_kernel_device_path($scfg, $storeid, $name);
+    my $kerneldev = get_rbd_dev_path($scfg, $storeid, $name);
 
     if (-b $kerneldev) {
        my $cmd = $rbd_cmd->($scfg, $storeid, 'unmap', $kerneldev);
@@ -822,6 +837,9 @@ sub rename_volume {
        errmsg => "could not rename image '${source_image}' to '${target_volname}'",
     );
 
+    eval { $class->unmap_volume($storeid, $scfg, $source_volname); };
+    warn $@ if $@;
+
     $base_name = $base_name ? "${base_name}/" : '';
 
     return "${storeid}:${base_name}${target_volname}";