use POSIX;
use PVE::Tools qw(run_command);
use PVE::Storage::Plugin;
-
+use PVE::RPCEnvironment;
use base qw(PVE::Storage::Plugin);
sub plugindata {
return {
- content => [ {images => 1}, { images => 1 }],
+ content => [ {images => 1, rootdir => 1}, {images => 1 , rootdir => 1}],
+ format => [ { raw => 1, subvol => 1 } , 'raw' ],
};
}
sparse => { optional => 1 },
nodes => { optional => 1 },
disable => { optional => 1 },
- maxfiles => { optional => 1 },
content => { optional => 1 },
};
}
my @lines = split /\n/, $text;
foreach my $line (@lines) {
- if ($line =~ /^(.+)\s+([a-zA-Z0-9\.]+|\-)\s+(.+)$/) {
- my $zvol = {};
- my @parts = split /\//, $1;
- my $name = pop @parts;
- my $pool = join('/', @parts);
-
- if ($pool !~ /^rpool$/) {
- next unless $name =~ m!^(\w+)-(\d+)-(\w+)-(\d+)$!;
- $name = $pool . '/' . $name;
+ my ($dataset, $size, $origin, $type, $refquota) = split(/\s+/, $line);
+ next if !($type eq 'volume' || $type eq 'filesystem');
+
+ my $zvol = {};
+ my @parts = split /\//, $dataset;
+ next if scalar(@parts) < 2; # we need pool/name
+ my $name = pop @parts;
+ my $pool = join('/', @parts);
+
+ 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') {
+ $zvol->{size} = 0;
} else {
- next;
- }
-
- $zvol->{pool} = $pool;
- $zvol->{name} = $name;
- $zvol->{size} = zfs_parse_size($2);
- if ($3 !~ /^-$/) {
- $zvol->{origin} = $3;
+ $zvol->{size} = zfs_parse_size($refquota);
}
- push @$list, $zvol;
+ $zvol->{format} = 'subvol';
+ } else {
+ $zvol->{size} = zfs_parse_size($size);
+ $zvol->{format} = 'raw';
}
+ if ($origin !~ /^-$/) {
+ $zvol->{origin} = $origin;
+ }
+ push @$list, $zvol;
}
return $list;
sub parse_volname {
my ($class, $volname) = @_;
- if ($volname =~ m/^(((base|vm)-(\d+)-\S+)\/)?((base)?(vm)?-(\d+)-\S+)$/) {
- return ('images', $5, $8, $2, $4, $6);
+ if ($volname =~ m/^(((base|basevol)-(\d+)-\S+)\/)?((base|basevol|vm|subvol)-(\d+)-\S+)$/) {
+ my $format = ($6 eq 'subvol' || $6 eq 'basevol') ? 'subvol' : 'raw';
+ my $isBase = ($6 eq 'base' || $6 eq 'basevol');
+ return ('images', $5, $7, $2, $4, $isBase, $format);
}
die "unable to parse zfs volume name '$volname'\n";
# virtual zfs methods (subclass can overwrite them)
sub path {
- my ($class, $scfg, $volname) = @_;
+ my ($class, $scfg, $volname, $storeid, $snapname) = @_;
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
my $path = '';
- if($vtype eq "images"){
- $path = "/dev/zvol/$scfg->{pool}/$volname";
+ if ($vtype eq "images") {
+ if ($name =~ m/^subvol-/ || $name =~ m/^basevol-/) {
+ # fixme: we currently assume standard mount point?!
+ $path = "/$scfg->{pool}/$name";
+ } else {
+ $path = "/dev/zvol/$scfg->{pool}/$name";
+ }
+ $path .= "\@$snapname" if defined($snapname);
} else {
die "$vtype is not allowed in ZFSPool!";
}
sub zfs_request {
my ($class, $scfg, $timeout, $method, @params) = @_;
- $timeout = 5 if !$timeout;
+ my $default_timeout = PVE::RPCEnvironment::is_worker() ? 60*60 : 5;
my $cmd = [];
if ($method eq 'zpool_list') {
- push @$cmd = 'zpool', 'list';
+ push @$cmd, 'zpool', 'list';
+ } elsif ($method eq 'zpool_import') {
+ push @$cmd, 'zpool', 'import';
+ $default_timeout = 15 if $default_timeout < 15;
} else {
push @$cmd, 'zfs', $method;
}
$msg .= "$line\n";
};
- run_command($cmd, outfunc => $output, timeout => $timeout);
+ $timeout = $default_timeout if !$timeout;
+
+ run_command($cmd, errmsg => "zfs error", outfunc => $output, timeout => $timeout);
return $msg;
}
sub alloc_image {
my ($class, $storeid, $scfg, $vmid, $fmt, $name, $size) = @_;
- die "unsupported format '$fmt'" if $fmt ne 'raw';
+ my $volname = $name;
+
+ if ($fmt eq 'raw') {
- die "illegal name '$name' - sould be 'vm-$vmid-*'\n"
- if $name && $name !~ m/^vm-$vmid-/;
+ die "illegal name '$volname' - sould be 'vm-$vmid-*'\n"
+ if $volname && $volname !~ m/^vm-$vmid-/;
+ $volname = $class->zfs_find_free_diskname($storeid, $scfg, $vmid, $fmt)
+ if !$volname;
- $name = $class->zfs_find_free_diskname($storeid, $scfg, $vmid) if !$name;
-
- $class->zfs_create_zvol($scfg, $name, $size);
+ $class->zfs_create_zvol($scfg, $volname, $size);
+ my $devname = "/dev/zvol/$scfg->{pool}/$volname";
+
+ run_command("udevadm trigger --subsystem-match block");
+ system('udevadm', 'settle', '--timeout', '10', "--exit-if-exists=${devname}");
- return $name;
+ } elsif ( $fmt eq 'subvol') {
+
+ die "illegal name '$volname' - sould be 'subvol-$vmid-*'\n"
+ if $volname && $volname !~ m/^subvol-$vmid-/;
+ $volname = $class->zfs_find_free_diskname($storeid, $scfg, $vmid, $fmt)
+ if !$volname;
+
+ die "illegal name '$volname' - sould be 'subvol-$vmid-*'\n"
+ if $volname !~ m/^subvol-$vmid-/;
+
+ $class->zfs_create_subvol($scfg, $volname, $size);
+
+ } else {
+ die "unsupported format '$fmt'";
+ }
+
+ return $volname;
}
sub free_image {
foreach my $image (keys %$dat) {
- my $volname = $dat->{$image}->{name};
- my $parent = $dat->{$image}->{parent};
+ my $info = $dat->{$image};
+
+ my $volname = $info->{name};
+ my $parent = $info->{parent};
+ my $owner = $info->{vmid};
- my $volid = undef;
- if ($parent && $parent =~ m/^(\S+)@(\S+)$/) {
+ if ($parent && $parent =~ m/^(\S+)\@__base__$/) {
my ($basename) = ($1);
- $volid = "$storeid:$basename/$volname";
+ $info->{volid} = "$storeid:$basename/$volname";
} else {
- $volid = "$storeid:$volname";
+ $info->{volid} = "$storeid:$volname";
}
- my $owner = $dat->{$volname}->{vmid};
if ($vollist) {
- my $found = grep { $_ eq $volid } @$vollist;
+ my $found = grep { $_ eq $info->{volid} } @$vollist;
next if !$found;
} else {
next if defined ($vmid) && ($owner ne $vmid);
}
- my $info = $dat->{$volname};
- $info->{volid} = $volid;
push @$res, $info;
}
}
-
return $res;
}
return ($available, $used);
}
-sub zfs_get_zvol_size {
- my ($class, $scfg, $zvol) = @_;
-
- my $text = $class->zfs_request($scfg, undef, 'get', '-Hp', 'volsize', "$scfg->{pool}/$zvol");
-
- if ($text =~ /volsize\s(\d+)/) {
- return $1;
- }
-
- die "Could not get zvol size";
-}
-
sub zfs_create_zvol {
my ($class, $scfg, $zvol, $size) = @_;
$class->zfs_request($scfg, undef, @$cmd);
}
+sub zfs_create_subvol {
+ my ($class, $scfg, $volname, $size) = @_;
+
+ my $dataset = "$scfg->{pool}/$volname";
+
+ my $cmd = ['create', '-o', 'acltype=posixacl', '-o', 'xattr=sa',
+ '-o', "refquota=${size}k", $dataset];
+
+ $class->zfs_request($scfg, undef, @$cmd);
+}
+
sub zfs_delete_zvol {
my ($class, $scfg, $zvol) = @_;
- $class->zfs_request($scfg, undef, 'destroy', '-r', "$scfg->{pool}/$zvol");
+ my $err;
+
+ for (my $i = 0; $i < 6; $i++) {
+
+ eval { $class->zfs_request($scfg, undef, 'destroy', '-r', "$scfg->{pool}/$zvol"); };
+ if ($err = $@) {
+ if ($err =~ m/^zfs error:(.*): dataset is busy.*/) {
+ sleep(1);
+ } elsif ($err =~ m/^zfs error:.*: dataset does not exist.*$/) {
+ $err = undef;
+ last;
+ } else {
+ die $err;
+ }
+ } else {
+ last;
+ }
+ }
+
+ die $err if $err;
}
sub zfs_list_zvol {
my ($class, $scfg) = @_;
- my $text = $class->zfs_request($scfg, 10, 'list', '-o', 'name,volsize,origin', '-t', 'volume', '-Hr');
+ my $text = $class->zfs_request($scfg, 10, 'list', '-o', 'name,volsize,origin,type,refquota', '-t', 'volume,filesystem', '-Hr');
my $zvols = zfs_parse_zvol_list($text);
return undef if !$zvols;
my $list = ();
foreach my $zvol (@$zvols) {
- my @values = split('/', $zvol->{name});
-
- my $image = pop @values;
- my $pool = join('/', @values);
-
- next if $image !~ m/^((vm|base)-(\d+)-\S+)$/;
- my $owner = $3;
-
+ 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}->{$image} = {
- name => $image,
+ $list->{$pool}->{$name} = {
+ name => $name,
size => $zvol->{size},
parent => $parent,
- format => 'raw',
- vmid => $owner
+ format => $zvol->{format},
+ vmid => $zvol->{owner},
};
}
}
sub zfs_find_free_diskname {
- my ($class, $storeid, $scfg, $vmid) = @_;
+ my ($class, $storeid, $scfg, $vmid, $format) = @_;
my $name = undef;
my $volumes = $class->zfs_list_zvol($scfg);
foreach my $image (keys %$dat) {
my $volname = $dat->{$image}->{name};
- if ($volname =~ m/(vm|base)-$vmid-disk-(\d+)/){
+ if ($volname =~ m/(vm|base|subvol|basevol)-$vmid-disk-(\d+)/){
$disk_ids->{$2} = 1;
}
}
for (my $i = 1; $i < 100; $i++) {
if (!$disk_ids->{$i}) {
- return "vm-$vmid-disk-$i";
+ return $format eq 'subvol' ? "subvol-$vmid-disk-$i" : "vm-$vmid-disk-$i";
}
}
sub zfs_get_latest_snapshot {
my ($class, $scfg, $volname) = @_;
+ my $vname = ($class->parse_volname($volname))[1];
+
# abort rollback if snapshot is not the latest
my @params = ('-t', 'snapshot', '-o', 'name', '-s', 'creation');
- my $text = zfs_request($class, $scfg, undef, 'list', @params);
+ my $text = $class->zfs_request($scfg, undef, 'list', @params);
my @snapshots = split(/\n/, $text);
my $recentsnap;
foreach (@snapshots) {
- if (/$scfg->{pool}\/$volname/) {
+ if (/$scfg->{pool}\/$vname/) {
s/^.*@//;
$recentsnap = $_;
}
sub volume_size_info {
my ($class, $scfg, $storeid, $volname, $timeout) = @_;
- return $class->zfs_get_zvol_size($scfg, $volname);
+ my (undef, $vname, undef, undef, undef, undef, $format) =
+ $class->parse_volname($volname);
+
+ my $attr = $format eq 'subvol' ? 'refquota' : 'volsize';
+ my $text = $class->zfs_request($scfg, undef, 'get', '-Hp', $attr, "$scfg->{pool}/$vname");
+ if ($text =~ /\s$attr\s(\d+)\s/) {
+ return $1;
+ }
+
+ die "Could not get zfs volume size\n";
}
sub volume_snapshot {
- my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
+ my ($class, $scfg, $storeid, $volname, $snap) = @_;
+
+ my $vname = ($class->parse_volname($volname))[1];
- $class->zfs_request($scfg, undef, 'snapshot', "$scfg->{pool}/$volname\@$snap");
+ $class->zfs_request($scfg, undef, 'snapshot', "$scfg->{pool}/$vname\@$snap");
}
sub volume_snapshot_delete {
my ($class, $scfg, $storeid, $volname, $snap, $running) = @_;
- $class->zfs_request($scfg, undef, 'destroy', "$scfg->{pool}/$volname\@$snap");
+ my $vname = ($class->parse_volname($volname))[1];
+
+ $class->deactivate_volume($storeid, $scfg, $vname, $snap, {});
+ $class->zfs_request($scfg, undef, 'destroy', "$scfg->{pool}/$vname\@$snap");
}
sub volume_snapshot_rollback {
my ($class, $scfg, $storeid, $volname, $snap) = @_;
- # abort rollback if snapshot is not the latest
+ my $vname = ($class->parse_volname($volname))[1];
+
+ $class->zfs_request($scfg, undef, 'rollback', "$scfg->{pool}/$vname\@$snap");
+}
+
+sub volume_rollback_is_possible {
+ my ($class, $scfg, $storeid, $volname, $snap) = @_;
+
my $recentsnap = $class->zfs_get_latest_snapshot($scfg, $volname);
if ($snap ne $recentsnap) {
- die "cannot rollback, more recent snapshots exist\n";
+ die "can't rollback, more recent snapshots exist\n";
}
- zfs_request($class, $scfg, undef, 'rollback', "$scfg->{pool}/$volname\@$snap");
+ return 1;
}
sub activate_storage {
my ($class, $storeid, $scfg, $cache) = @_;
+
+ # Note: $scfg->{pool} can include dataset <pool>/<dataset>
+ my $pool = $scfg->{pool};
+ $pool =~ s!/.*$!!;
+
+ my @param = ('-o', 'name', '-H', "$pool");
+ my $res;
+ eval {
+ $res = $class->zfs_request($scfg, undef, 'zpool_list', @param);
+ };
+
+ if ($@ || !defined($res) || $res !~ $pool) {
+ eval {
+ @param = ('-d', '/dev/disk/by-id/', "$pool");
+ $class->zfs_request($scfg, undef, 'zpool_import', @param);
+ };
+ die "could not activate storage '$storeid', $@\n" if $@;
+ }
return 1;
}
}
sub activate_volume {
- my ($class, $storeid, $scfg, $volname, $exclusive, $cache) = @_;
+ my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_;
return 1;
}
sub deactivate_volume {
- my ($class, $storeid, $scfg, $volname, $exclusive, $cache) = @_;
+ my ($class, $storeid, $scfg, $volname, $snapname, $cache) = @_;
return 1;
}
$snap ||= '__base__';
- my ($vtype, $basename, $basevmid, undef, undef, $isBase) =
+ my ($vtype, $basename, $basevmid, undef, undef, $isBase, $format) =
$class->parse_volname($volname);
die "clone_image only works on base images\n" if !$isBase;
- my $name = $class->zfs_find_free_diskname($storeid, $scfg, $vmid);
+ my $name = $class->zfs_find_free_diskname($storeid, $scfg, $vmid, $format);
- $class->zfs_request($scfg, undef, 'clone', "$scfg->{pool}/$basename\@$snap", "$scfg->{pool}/$name");
+ if ($format eq 'subvol') {
+ my $size = $class->zfs_request($scfg, undef, 'list', '-H', '-o', 'refquota', "$scfg->{pool}/$basename");
+ chomp($size);
+ $class->zfs_request($scfg, undef, 'clone', "$scfg->{pool}/$basename\@$snap", "$scfg->{pool}/$name", '-o', "refquota=$size");
+ } else {
+ $class->zfs_request($scfg, undef, 'clone', "$scfg->{pool}/$basename\@$snap", "$scfg->{pool}/$name");
+ }
- return $name;
+ return "$basename/$name";
}
sub create_base {
my $snap = '__base__';
- my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
+ my ($vtype, $name, $vmid, $basename, $basevmid, $isBase, $format) =
$class->parse_volname($volname);
die "create_base not possible with base image\n" if $isBase;
my $newname = $name;
- $newname =~ s/^vm-/base-/;
-
+ if ( $format eq 'subvol' ) {
+ $newname =~ s/^subvol-/basevol-/;
+ } else {
+ $newname =~ s/^vm-/base-/;
+ }
my $newvolname = $basename ? "$basename/$newname" : "$newname";
$class->zfs_request($scfg, undef, 'rename', "$scfg->{pool}/$name", "$scfg->{pool}/$newname");
return $newvolname;
}
+sub volume_resize {
+ my ($class, $scfg, $storeid, $volname, $size, $running) = @_;
+
+ my $new_size = int($size/1024);
+
+ my (undef, $vname, undef, undef, undef, undef, $format) =
+ $class->parse_volname($volname);
+
+ my $attr = $format eq 'subvol' ? 'refquota' : 'volsize';
+
+ $class->zfs_request($scfg, undef, 'set', "$attr=${new_size}k", "$scfg->{pool}/$vname");
+
+ return $new_size;
+}
+
sub volume_has_feature {
my ($class, $scfg, $feature, $storeid, $volname, $snapname, $running) = @_;
clone => { base => 1},
template => { current => 1},
copy => { base => 1, current => 1},
+ sparseinit => { base => 1, current => 1},
};
my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
projects / pve-storage.git / blobdiff