yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rbd: fix #3286 add namespace support

Browse Source 
This patch introduces support for Cephs RBD namespaces.

A new storage config parameter 'namespace' defines the namespace to be
used for the RBD storage.

The namespace must already exist in the Ceph cluster as it is not
automatically created.

The main intention is to use this for external Ceph clusters. With
namespaces, each PVE cluster can get its own namespace and will not
conflict with other PVE clusters.

Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com>
This commit is contained in:
Aaron Lauterer
2021-04-07 16:22:17 +02:00
committed by Thomas Lamprecht
parent aeb007cb76
commit e9bc993138
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
PVE/Storage/RBDPlugin.pm
View File

@ -25,6 +25,8 @@ my $get_parent_image_name = sub {
my $get_rbd_path = sub {
my ($scfg, $volume) = @_;
my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
return "${pool}/$scfg->{namespace}/${volume}" if defined($scfg->{namespace});
return "${pool}/${volume}";
};
@ -36,6 +38,14 @@ my $build_cmd = sub {
my $cmd = [$binary, '-p', $pool];
# some subcommands will fail if the --namespace parameter is present
my $no_namespace_parameter = {
unmap => 1,
};
push @$cmd, '--namespace', $scfg->{namespace}
if ($scfg->{namespace} && !$no_namespace_parameter->{$op});
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});
@ -152,6 +162,7 @@ sub rbd_ls {
my $cmd = &$rbd_cmd($scfg, $storeid, 'ls', '-l', '--format', 'json');
my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
$pool .= "/$scfg->{namespace}" if defined($scfg->{namespace});
my $raw = '';
my $parser = sub { $raw .= shift };
@ -279,6 +290,10 @@ sub properties {
description => "Pool.",
type => 'string',
},
namespace=> {
description => "RBD Namespace.",
type => 'string',
},
username => {
description => "RBD Id.",
type => 'string',
@ -300,6 +315,7 @@ sub options {
disable => { optional => 1 },
monhost => { optional => 1},
pool => { optional => 1 },
namespace => { optional => 1 },
username => { optional => 1 },
content => { optional => 1 },
krbd => { optional => 1 },
@ -368,6 +384,7 @@ sub find_free_diskname {
my ($class, $storeid, $scfg, $vmid, $fmt, $add_fmt_suffix) = @_;
my $cmd = &$rbd_cmd($scfg, $storeid, 'ls');
my $disk_list = [];
my $parser = sub {
@ -498,6 +515,7 @@ sub free_image {
my ($vtype, $name, $vmid, undef, undef, undef) =
$class->parse_volname($volname);
my $snaps = rbd_ls_snap($scfg, $storeid, $name);
foreach my $snap (keys %$snaps) {
if ($snaps->{$snap}->{protected}) {
@ -522,6 +540,7 @@ sub list_images {
$cache->{rbd} = rbd_ls($scfg, $storeid) if !$cache->{rbd};
my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
$pool .= "/$scfg->{namespace}" if defined($scfg->{namespace});
my $res = [];