return $parent->{image} . "@" . $parent->{snapshot};
};
-my $add_pool_to_disk = sub {
- my ($scfg, $disk) = @_;
-
+my sub get_rbd_path {
+ my ($scfg, $volume) = @_;
my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
+ my $namespace = $scfg->{namespace};
- return "$pool/$disk";
+ return "${pool}/${namespace}/${volume}" if defined($namespace);
+ return "${pool}/${volume}";
};
my $build_cmd = sub {
my $cmd = [$binary, '-p', $pool];
+ if (defined(my $namespace = $scfg->{namespace})) {
+ # some subcommands will fail if the --namespace parameter is present
+ my $no_namespace_parameter = {
+ unmap => 1,
+ };
+ push @$cmd, '--namespace', "$namespace" if !$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});
*STDERR->flush();
};
}
-
+
eval { run_command($cmd, %args); };
if (my $err = $@) {
die $errmsg . $lasterr if length($lasterr);
sub rbd_ls {
my ($scfg, $storeid) = @_;
- 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 };
+ my $cmd = $rbd_cmd->($scfg, $storeid, 'ls', '-l', '--format', 'json');
eval {
run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
};
sub rbd_ls_snap {
my ($scfg, $storeid, $name) = @_;
- my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'ls', $name, '--format', 'json');
+ 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; });
push @options, '--snap', $snap;
}
- $cmd = &$rbd_cmd($scfg, $storeid, @options);
+ $cmd = $rbd_cmd->($scfg, $storeid, @options);
my $raw = '';
my $parser = sub { $raw .= shift };
description => "Pool.",
type => 'string',
},
+ namespace => {
+ description => "RBD Namespace.",
+ type => 'string',
+ },
username => {
description => "RBD Id.",
type => 'string',
disable => { optional => 1 },
monhost => { optional => 1},
pool => { optional => 1 },
+ namespace => { optional => 1 },
username => { optional => 1 },
content => { optional => 1 },
krbd => { optional => 1 },
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 {
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 ($vtype, $name, $vmid) = $class->parse_volname($volname);
$name .= '@'.$snapname if $snapname;
- my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
- return ("/dev/rbd/$pool/$name", $vmid, $vtype) if $scfg->{krbd};
+ my $rbd_path = get_rbd_path($scfg, $name);
+ return ("/dev/rbd/${rbd_path}", $vmid, $vtype) if $scfg->{krbd};
- my $path = "rbd:$pool/$name";
+ my $path = "rbd:${rbd_path}";
$path .= ":conf=$cmd_option->{ceph_conf}" if $cmd_option->{ceph_conf};
if (defined($scfg->{monhost})) {
sub find_free_diskname {
my ($class, $storeid, $scfg, $vmid, $fmt, $add_fmt_suffix) = @_;
- my $cmd = &$rbd_cmd($scfg, $storeid, 'ls');
+ my $cmd = $rbd_cmd->($scfg, $storeid, 'ls');
+
my $disk_list = [];
my $parser = sub {
my $newvolname = $basename ? "$basename/$newname" : "$newname";
- my $cmd = &$rbd_cmd($scfg, $storeid, 'rename', &$add_pool_to_disk($scfg, $name), &$add_pool_to_disk($scfg, $newname));
+ my $cmd = $rbd_cmd->(
+ $scfg,
+ $storeid,
+ 'rename',
+ get_rbd_path($scfg, $name),
+ get_rbd_path($scfg, $newname),
+ );
run_rbd_command($cmd, errmsg => "rbd rename '$name' error");
my $running = undef; #fixme : is create_base always offline ?
my (undef, undef, undef, $protected) = rbd_volume_info($scfg, $storeid, $newname, $snap);
if (!$protected){
- my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'protect', $newname, '--snap', $snap);
+ my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'protect', $newname, '--snap', $snap);
run_rbd_command($cmd, errmsg => "rbd protect $newname snap '$snap' error");
}
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);
+ 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',
+ get_rbd_path($scfg, $basename),
+ '--snap',
+ $snap,
+ get_rbd_path($scfg, $name),
+ );
run_rbd_command($cmd, errmsg => "rbd clone '$basename' error");
$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);
+ 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");
return $name;
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}) {
- my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'unprotect', $name, '--snap', $snap);
+ my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'unprotect', $name, '--snap', $snap);
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);
+ my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'purge', $name);
run_rbd_command($cmd, errmsg => "rbd snap purge '$volname' error");
- $cmd = &$rbd_cmd($scfg, $storeid, 'rm', $name);
+ $cmd = $rbd_cmd->($scfg, $storeid, 'rm', $name);
run_rbd_command($cmd, errmsg => "rbd rm '$volname' error");
return undef;
$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 = [];
sub status {
my ($class, $storeid, $scfg, $cache) = @_;
-
- my $rados = &$librados_connect($scfg, $storeid);
+ my $rados = $librados_connect->($scfg, $storeid);
my $df = $rados->mon_command({ prefix => 'df', format => 'json' });
my ($d) = grep { $_->{name} eq $scfg->{pool} } @{$df->{pools}};
return 1;
}
-my $get_kernel_device_name = sub {
- my ($pool, $name) = @_;
-
- return "/dev/rbd/$pool/$name";
+my sub get_kernel_device_path {
+ my ($scfg, $name) = @_;
+ return "/dev/rbd/" . get_rbd_path($scfg, $name);
};
sub map_volume {
my $name = $img_name;
$name .= '@'.$snapname if $snapname;
- my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
-
- my $kerneldev = $get_kernel_device_name->($pool, $name);
+ my $kerneldev = get_kernel_device_path($scfg, $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);
+ my $cmd = $rbd_cmd->($scfg, $storeid, 'map', $name);
run_rbd_command($cmd, errmsg => "can't map rbd volume $name");
return $kerneldev;
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);
+ my $kerneldev = get_kernel_device_path($scfg, $name);
if (-b $kerneldev) {
- my $cmd = &$rbd_cmd($scfg, $storeid, 'unmap', $kerneldev);
+ my $cmd = $rbd_cmd->($scfg, $storeid, 'unmap', $kerneldev);
run_rbd_command($cmd, errmsg => "can't unmap rbd device $kerneldev");
}
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
- my $cmd = &$rbd_cmd($scfg, $storeid, 'resize', '--allow-shrink', '--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;
}
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
- my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'create', '--snap', $snap, $name);
+ my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'create', '--snap', $snap, $name);
run_rbd_command($cmd, errmsg => "rbd snapshot '$volname' error");
return undef;
}
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
- my $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'rollback', '--snap', $snap, $name);
+ my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'rollback', '--snap', $snap, $name);
run_rbd_command($cmd, errmsg => "rbd snapshot $volname to '$snap' error");
}
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);
+ 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);
+ my $cmd = $rbd_cmd->($scfg, $storeid, 'snap', 'rm', '--snap', $snap, $name);
run_rbd_command($cmd, errmsg => "rbd snapshot '$volname' error");
return undef;
}
+sub volume_snapshot_needs_fsfreeze {
+ return 1;
+}
+
sub volume_has_feature {
my ($class, $scfg, $feature, $storeid, $volname, $snapname, $running) = @_;
sparseinit => { base => 1, current => 1},
};
- my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
- $class->parse_volname($volname);
+ my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) = $class->parse_volname($volname);
my $key = undef;
- if($snapname){
+ if ($snapname){
$key = 'snap';
- }else{
- $key = $isBase ? 'base' : 'current';
+ } else {
+ $key = $isBase ? 'base' : 'current';
}
return 1 if $features->{$feature}->{$key};