# static zfs helper methods
sub zfs_parse_zvol_list {
- my ($text) = @_;
+ my ($text, $pool) = @_;
my $list = ();
my @parts = split /\//, $dataset;
next if scalar(@parts) < 2; # we need pool/name
my $name = pop @parts;
- my $pool = join('/', @parts);
+ my $parsed_pool = join('/', @parts);
+ next if $parsed_pool ne $pool;
next unless $name =~ m!^(vm|base|subvol|basevol)-(\d+)-(\S+)$!;
$zvol->{owner} = $2;
- $zvol->{pool} = $pool;
$zvol->{name} = $name;
if ($type eq 'filesystem') {
if ($refquota eq 'none') {
my $msg = '';
my $output = sub { $msg .= "$_[0]\n" };
- $timeout = PVE::RPCEnvironment->is_worker() ? 60*60 : 5 if !$timeout;
+ if (PVE::RPCEnvironment->is_worker()) {
+ $timeout = 60*60 if !$timeout;
+ $timeout = 60*5 if $timeout < 60*5;
+ } else {
+ $timeout = 10 if !$timeout;
+ }
run_command($cmd, errmsg => "zfs error", outfunc => $output, timeout => $timeout);
sub list_images {
my ($class, $storeid, $scfg, $vmid, $vollist, $cache) = @_;
- $cache->{zfs} = $class->zfs_list_zvol($scfg) if !$cache->{zfs};
- my $zfspool = $scfg->{pool};
- my $res = [];
-
- if (my $dat = $cache->{zfs}->{$zfspool}) {
-
- foreach my $image (keys %$dat) {
+ my $zfs_list = $class->zfs_list_zvol($scfg);
- my $info = $dat->{$image};
+ my $res = [];
- my $volname = $info->{name};
- my $parent = $info->{parent};
- my $owner = $info->{vmid};
+ for my $info (values $zfs_list->%*) {
+ my $volname = $info->{name};
+ my $parent = $info->{parent};
+ my $owner = $info->{vmid};
- if ($parent && $parent =~ m/^(\S+)\@__base__$/) {
- my ($basename) = ($1);
- $info->{volid} = "$storeid:$basename/$volname";
- } else {
- $info->{volid} = "$storeid:$volname";
- }
-
- if ($vollist) {
- my $found = grep { $_ eq $info->{volid} } @$vollist;
- next if !$found;
- } else {
- next if defined ($vmid) && ($owner ne $vmid);
- }
+ if ($parent && $parent =~ m/^(\S+)\@__base__$/) {
+ my ($basename) = ($1);
+ $info->{volid} = "$storeid:$basename/$volname";
+ } else {
+ $info->{volid} = "$storeid:$volname";
+ }
- push @$res, $info;
+ if ($vollist) {
+ my $found = grep { $_ eq $info->{volid} } @$vollist;
+ next if !$found;
+ } else {
+ next if defined ($vmid) && ($owner ne $vmid);
}
+
+ push @$res, $info;
}
return $res;
}
sub zfs_list_zvol {
my ($class, $scfg) = @_;
- my $text = $class->zfs_request($scfg, 10, 'list', '-o', 'name,volsize,origin,type,refquota', '-t', 'volume,filesystem', '-Hrp');
- my $zvols = zfs_parse_zvol_list($text);
- return undef if !$zvols;
-
- my $list = ();
+ my $text = $class->zfs_request(
+ $scfg,
+ 10,
+ 'list',
+ '-o',
+ 'name,volsize,origin,type,refquota',
+ '-t',
+ 'volume,filesystem',
+ '-d1',
+ '-Hp',
+ $scfg->{pool},
+ );
+ # It's still required to have zfs_parse_zvol_list filter by pool, because -d1 lists
+ # $scfg->{pool} too and while unlikely, it could be named to be mistaken for a volume.
+ my $zvols = zfs_parse_zvol_list($text, $scfg->{pool});
+ return {} if !$zvols;
+
+ my $list = {};
foreach my $zvol (@$zvols) {
- my $pool = $zvol->{pool};
my $name = $zvol->{name};
my $parent = $zvol->{origin};
if($zvol->{origin} && $zvol->{origin} =~ m/^$scfg->{pool}\/(\S+)$/){
$parent = $1;
}
- $list->{$pool}->{$name} = {
+ $list->{$name} = {
name => $name,
size => $zvol->{size},
parent => $parent,
sub zfs_get_sorted_snapshot_list {
my ($class, $scfg, $volname, $sort_params) = @_;
+ my @params = ('-H', '-r', '-t', 'snapshot', '-o', 'name', $sort_params->@*);
+
my $vname = ($class->parse_volname($volname))[1];
+ push @params, "$scfg->{pool}\/$vname";
- my @params = ('-H', '-t', 'snapshot', '-o', 'name', $sort_params->@*, "$scfg->{pool}\/$vname");
my $text = $class->zfs_request($scfg, undef, 'list', @params);
my @snapshots = split(/\n/, $text);
sub volume_size_info {
my ($class, $scfg, $storeid, $volname, $timeout) = @_;
- my (undef, $vname, undef, undef, undef, undef, $format) =
+ my (undef, $vname, undef, $parent, undef, undef, $format) =
$class->parse_volname($volname);
my $attr = $format eq 'subvol' ? 'refquota' : 'volsize';
- my $value = $class->zfs_get_properties($scfg, $attr, "$scfg->{pool}/$vname");
- if ($value =~ /^(\d+)$/) {
- return $1;
+ my ($size, $used) = $class->zfs_get_properties($scfg, "$attr,usedbydataset", "$scfg->{pool}/$vname");
+
+ $used = ($used =~ /^(\d+)$/) ? $1 : 0;
+
+ if ($size =~ /^(\d+)$/) {
+ return wantarray ? ($1, $format, $used, $parent) : $1;
}
die "Could not get zfs volume size\n";
return 1;
}
-sub volume_snapshot_list {
+sub volume_snapshot_info {
my ($class, $scfg, $storeid, $volname) = @_;
- my $snaps = [];
- # return an empty array if dataset does not exist.
- eval { $snaps = $class->zfs_get_sorted_snapshot_list($scfg, $volname, ['-S', 'name']); };
- return $snaps;
+ my @params = ('-Hp', '-r', '-t', 'snapshot', '-o', 'name,guid,creation');
+
+ my $vname = ($class->parse_volname($volname))[1];
+ push @params, "$scfg->{pool}\/$vname";
+
+ my $text = $class->zfs_request($scfg, undef, 'list', @params);
+ my @lines = split(/\n/, $text);
+
+ my $info = {};
+ for my $line (@lines) {
+ my ($snapshot, $guid, $creation) = split(/\s+/, $line);
+ (my $snap_name = $snapshot) =~ s/^.*@//;
+
+ $info->{$snap_name} = {
+ id => $guid,
+ timestamp => $creation,
+ };
+ }
+ return $info;
}
my sub dataset_mounted_heuristic {
copy => { base => 1, current => 1},
sparseinit => { base => 1, current => 1},
replicate => { base => 1, current => 1},
+ rename => {current => 1},
};
my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
die "internal error: invalid file handle for volume_import\n"
if !defined($fd);
- my (undef, $dataset, $vmid) = $class->parse_volname($volname);
+ my (undef, $dataset, $vmid, undef, undef, undef, $volume_format) =
+ $class->parse_volname($volname);
+
my $zfspath = "$scfg->{pool}/$dataset";
my $suffix = defined($base_snapshot) ? "\@$base_snapshot" : '';
my $exists = 0 == run_command(['zfs', 'get', '-H', 'name', $zfspath.$suffix],
} elsif ($exists) {
die "volume '$zfspath' already exists\n" if !$allow_rename;
warn "volume '$zfspath' already exists - importing with a different name\n";
- $dataset = $class->find_free_diskname($storeid, $scfg, $vmid, $format);
+ $dataset = $class->find_free_diskname($storeid, $scfg, $vmid, $volume_format);
$zfspath = "$scfg->{pool}/$dataset";
}
return $class->volume_export_formats($scfg, $storeid, $volname, $snapshot, $base_snapshot, $with_snapshots);
}
+sub rename_volume {
+ my ($class, $scfg, $storeid, $source_volname, $target_vmid, $target_volname) = @_;
+
+ my (
+ undef,
+ $source_image,
+ $source_vmid,
+ $base_name,
+ $base_vmid,
+ undef,
+ $format
+ ) = $class->parse_volname($source_volname);
+ $target_volname = $class->find_free_diskname($storeid, $scfg, $target_vmid, $format)
+ if !$target_volname;
+
+ my $pool = $scfg->{pool};
+ my $source_zfspath = "${pool}/${source_image}";
+ my $target_zfspath = "${pool}/${target_volname}";
+
+ my $exists = 0 == run_command(['zfs', 'get', '-H', 'name', $target_zfspath],
+ noerr => 1, quiet => 1);
+ die "target volume '${target_volname}' already exists\n" if $exists;
+
+ $class->zfs_request($scfg, 5, 'rename', ${source_zfspath}, ${target_zfspath});
+
+ $base_name = $base_name ? "${base_name}/" : '';
+
+ return "${storeid}:${base_name}${target_volname}";
+}
+
1;
projects / pve-storage.git / blobdiff