use strict;
use warnings;
+
use IO::File;
+use JSON;
use Net::IP;
-use PVE::Tools qw(run_command trim);
-use PVE::Storage::Plugin;
+
+use PVE::CephConfig;
use PVE::JSONSchema qw(get_standard_option);
+use PVE::ProcFSTools;
use PVE::RADOS;
-use PVE::Storage::CephTools;
+use PVE::Storage::Plugin;
+use PVE::Tools qw(run_command trim);
use base qw(PVE::Storage::Plugin);
-my $rbd_unittobytes = {
- "k" => 1024,
- "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) = @_;
-
+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 ($binary, $scfg, $storeid, $op, @options) = @_;
- my $cmd_option = PVE::Storage::CephTools::ceph_connect_option($scfg, $storeid);
+ my $cmd_option = PVE::CephConfig::ceph_connect_option($scfg, $storeid);
my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
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});
my $librados_connect = sub {
my ($scfg, $storeid, $options) = @_;
- my $librados_config = PVE::Storage::CephTools::ceph_connect_option($scfg, $storeid);
+ my $librados_config = PVE::CephConfig::ceph_connect_option($scfg, $storeid);
my $rados = PVE::RADOS->new(%$librados_config);
};
# needed for volumes created using ceph jewel (or higher)
-my $krbd_feature_disable = sub {
+my $krbd_feature_update = sub {
my ($scfg, $storeid, $name) = @_;
- return 1 if !$scfg->{krbd};
-
- my ($major, undef, undef, undef) = ceph_version();
- return 1 if $major < 10;
-
- my $krbd_feature_blacklist = ['deep-flatten', 'fast-diff', 'object-map', 'exclusive-lock'];
- my (undef, undef, undef, undef, $features) = rbd_volume_info($scfg, $storeid, $name);
+ my (@disable, @enable);
+ my ($kmajor, $kminor) = PVE::ProcFSTools::kernel_version();
- my $active_features = { map { $_ => 1 } PVE::Tools::split_list($features)};
- my $incompatible_features = join(',', grep { %$active_features{$_} } @$krbd_feature_blacklist);
-
- if ($incompatible_features) {
- my $feature_cmd = &$rbd_cmd($scfg, $storeid, 'feature', 'disable', $name, $incompatible_features);
- run_rbd_command($feature_cmd, errmsg => "could not disable krbd-incompatible image features of rbd volume $name");
+ 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';
}
-};
-my $ceph_version_parser = sub {
- my $line = shift;
- if ($line =~ m/^ceph version ((\d+)\.(\d+)\.(\d+))(?: \([a-fA-F0-9]+\))/) {
- return ($2, $3, $4, $1);
+ if ($kmajor >= 5) {
+ push @enable, 'exclusive-lock';
} else {
- warn "Could not parse Ceph version: '$line'\n";
+ push @disable, 'exclusive-lock';
}
-};
-
-sub ceph_version {
- my ($cache) = @_;
- my $version_string = $cache;
+ my $active_features_list = (rbd_volume_info($scfg, $storeid, $name))[4];
+ my $active_features = { map { $_ => 1 } @$active_features_list };
- my $major;
- my $minor;
- my $bugfix;
+ my $to_disable = join(',', grep { $active_features->{$_} } @disable);
+ my $to_enable = join(',', grep { !$active_features->{$_} } @enable );
- if (defined($version_string)) {
- ($major, $minor, $bugfix, $version_string) = &$ceph_version_parser($version_string);
- } else {
- run_command('ceph --version', outfunc => sub {
- my $line = shift;
- ($major, $minor, $bugfix, $version_string) = &$ceph_version_parser($line);
- });
+ 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",
+ );
}
- return undef if !defined($version_string);
- return wantarray ? ($major, $minor, $bugfix, $version_string) : $version_string;
-}
+ 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 {
my ($cmd, %args) = @_;
sub rbd_ls {
my ($scfg, $storeid) = @_;
- my $cmd = &$rbd_cmd($scfg, $storeid, 'ls', '-l');
my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
+ $pool .= "/$scfg->{namespace}" if defined($scfg->{namespace});
- my $list = {};
-
- my $parser = sub {
- my $line = shift;
-
- if ($line =~ m/^((vm|base)-(\d+)-\S+)\s+(\d+)(k|M|G|T)\s((\S+)\/((vm|base)-\d+-\S+@\S+))?/) {
- my ($image, $owner, $size, $unit, $parent) = ($1, $3, $4, $5, $8);
- return if $image =~ /@/; #skip snapshots
-
- $list->{$pool}->{$image} = {
- name => $image,
- size => $size*$rbd_unittobytes->{$unit},
- parent => $parent,
- vmid => $owner
- };
- }
- };
+ 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);
};
my $err = $@;
die $err if $err && $err !~ m/doesn't contain rbd images/ ;
-
+
+ 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 $list = {};
+
+ 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
+ };
+ }
+
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) = @_;
my $cmd = undef;
- if($snap){
- $cmd = &$rbd_cmd($scfg, $storeid, 'info', $volname, '--snap', $snap);
- }else{
- $cmd = &$rbd_cmd($scfg, $storeid, 'info', $volname);
+ my @options = ('info', $volname, '--format', 'json');
+ if ($snap) {
+ push @options, '--snap', $snap;
}
- my $size = undef;
- my $parent = undef;
- my $format = undef;
- my $protected = undef;
- my $features = undef;
+ $cmd = $rbd_cmd->($scfg, $storeid, @options);
- my $parser = sub {
- my $line = shift;
+ my $raw = '';
+ my $parser = sub { $raw .= shift };
- if ($line =~ m/size (\d+) (k|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";
- } elsif ($line =~ m/features:\s(.+)/) {
- $features = $1;
- }
+ run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
- };
+ 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";
+ }
- run_rbd_command($cmd, errmsg => "rbd error", errfunc => sub {}, outfunc => $parser);
+ $volume->{parent} = $get_parent_image_name->($volume->{parent});
+ $volume->{protected} = defined($volume->{protected}) && $volume->{protected} eq "true" ? 1 : undef;
- return ($size, $parent, $format, $protected, $features);
+ return $volume->@{qw(size parent format protected features)};
}
# Configuration
description => "Pool.",
type => 'string',
},
+ namespace=> {
+ description => "RBD Namespace.",
+ type => 'string',
+ },
username => {
description => "RBD Id.",
type => 'string',
type => 'string',
},
krbd => {
- description => "Access rbd through krbd kernel module.",
+ description => "Always access rbd through krbd kernel module.",
type => 'boolean',
},
};
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
- my $ceph_admin_keyring = '/etc/pve/priv/ceph.client.admin.keyring';
- my $ceph_storage_keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
-
- die "ceph authx keyring file for storage '$storeid' already exists!\n"
- if -e $ceph_storage_keyring;
-
- eval {
- mkdir '/etc/pve/priv/ceph';
- PVE::Tools::file_copy($ceph_admin_keyring, $ceph_storage_keyring);
- };
- if (my $err = $@) {
- unlink $ceph_storage_keyring;
- die "failed to copy ceph authx keyring for storage '$storeid': $err\n";
- }
+ 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
- my $ceph_storage_keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
- if (-f $ceph_storage_keyring) {
- unlink($ceph_storage_keyring) or warn "removing keyring of storage failed: $!\n";
- }
+ PVE::CephConfig::ceph_remove_keyfile($scfg->{type}, $storeid);
+ return;
}
sub parse_volname {
sub path {
my ($class, $scfg, $volname, $storeid, $snapname) = @_;
- my $cmd_option = PVE::Storage::CephTools::ceph_connect_option($scfg, $storeid);
+ my $cmd_option = PVE::CephConfig::ceph_connect_option($scfg, $storeid);
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})) {
- my $monhost = PVE::Storage::CephTools::hostlist($scfg->{monhost}, ';');
+ my $monhost = PVE::CephConfig::hostlist($scfg->{monhost}, ';');
$monhost =~ s/:/\\:/g;
$path .= ":mon_host=$monhost";
$path .= ":auth_supported=$cmd_option->{auth_supported}";
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 $cmd = &$rbd_cmd($scfg, $storeid, 'ls');
- my $disk_ids = {};
+ my $disk_list = [];
my $parser = sub {
my $line = shift;
-
- if ($line =~ m/^(vm|base)-\Q$vmid\E+-disk-(\d+)$/) {
- $disk_ids->{$2} = 1;
+ if ($line =~ m/^(.*)$/) { # untaint
+ push @$disk_list, $1;
}
};
die $err if $err && $err !~ m/doesn't contain rbd images/;
- #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";
-};
+ return PVE::Storage::Plugin::get_next_vm_diskname($disk_list, $storeid, $vmid, undef, $scfg);
+}
sub create_base {
my ($class, $storeid, $scfg, $volname) = @_;
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");
}
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";
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");
- &$krbd_feature_disable($scfg, $storeid, $name);
-
return $newvol;
}
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);
+ 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");
- &$krbd_feature_disable($scfg, $storeid, $name);
-
return $name;
}
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 $cmd = &$rbd_cmd($scfg, $storeid, 'snap', 'unprotect', $name, '--snap', $snap);
+
+ 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");
}
}
$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}};
# 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}->{bytes_used};
+ my $used = $d->{stats}->{stored} // $d->{stats}->{bytes_used};
my $total = $used + $free;
my $active = 1;
return 1;
}
-sub activate_volume {
- my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_;
+my $get_kernel_device_name = sub {
+ my ($scfg, $name) = @_;
+ return "/dev/rbd/" . get_rbd_path($scfg, $name);
+};
- return 1 if !$scfg->{krbd};
+sub map_volume {
+ my ($class, $storeid, $scfg, $volname, $snapname) = @_;
- my ($vtype, $name, $vmid) = $class->parse_volname($volname);
- my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
+ my ($vtype, $img_name, $vmid) = $class->parse_volname($volname);
+
+ my $name = $img_name;
+ $name .= '@'.$snapname if $snapname;
+
+ my $kerneldev = $get_kernel_device_name->($scfg, $name);
- my $path = "/dev/rbd/$pool/$name";
- $path .= '@'.$snapname if $snapname;
- return if -b $path;
+ 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 $cmd = &$rbd_cmd($scfg, $storeid, 'map', $name);
- run_rbd_command($cmd, errmsg => "can't mount rbd volume $name");
+
+ my $kerneldev = $get_kernel_device_name->($scfg, $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 deactivate_volume {
+sub activate_volume {
my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_;
- return 1 if !$scfg->{krbd};
+ $class->map_volume($storeid, $scfg, $volname, $snapname) if $scfg->{krbd};
- my ($vtype, $name, $vmid) = $class->parse_volname($volname);
- my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
+ return 1;
+}
- my $path = "/dev/rbd/$pool/$name";
- $path .= '@'.$snapname if $snapname;
- return if ! -b $path;
+sub deactivate_volume {
+ my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_;
- my $cmd = &$rbd_cmd($scfg, $storeid, 'unmap', $path);
- run_rbd_command($cmd, errmsg => "can't unmap rbd volume $name");
+ $class->unmap_volume($storeid, $scfg, $volname, $snapname);
return 1;
}
sub volume_resize {
my ($class, $scfg, $storeid, $volname, $size, $running) = @_;
- return 1 if $running && !$scfg->{krbd};
+ return 1 if $running && !$scfg->{krbd}; # FIXME???
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");
}
sub volume_snapshot_delete {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
- return 1 if $running && !$scfg->{krbd};
+ return 1 if $running && !$scfg->{krbd}; # FIXME: ????
$class->deactivate_volume($storeid, $scfg, $volname, $snap, {});
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) = @_;
projects / pve-storage.git / blobdiff