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

Improve parsing of zfs volumes (ZVOLs) in order to avoid filtering of zvols nested under another ZFS dataset.

Browse Source 
The actual code would only accept zvols like: POOL/vm-123-disk-1.
However, using POOL/DataSet/vm-123-disk-1 allows setting specific
proparties at POOL/DataSet level (like compression, etc.) which
would be inherited by any zvol created under such DataSet.

This allows more flexibility of zfs/zvol's management.

Signed-off-by: Pablo Ruiz García <pablo.ruiz@gmail.com>
This commit is contained in:
Pablo Ruiz Garcia
2014-02-23 00:00:43 +01:00
committed by Dietmar Maurer
parent 76f60be802
commit 5e4791804c
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
PVE/Storage/ZFSPlugin.pm
View File

@ -151,23 +151,22 @@ sub zfs_parse_zvol_list {
foreach my $line (@lines) { foreach my $line (@lines) {
if ($line =~ /^(.+)\s+([a-zA-Z0-9\.]+|\-)\s+(.+)$/) { if ($line =~ /^(.+)\s+([a-zA-Z0-9\.]+|\-)\s+(.+)$/) {
my $zvol = {}; my $zvol = {};
my $name; my @parts = split /\//, $1;
my $disk; my $name = pop @parts;
my @zvols = split /\//, $1; my $pool = join('/', @parts);
my $pool = $zvols[0];
if (scalar(@zvols) == 2 && $zvols[0] !~ /^rpool$/) { if ($pool !~ /^rpool$/) {
$disk = $zvols[1]; next unless $name =~ m!^(\w+)-(\d+)-(\w+)-(\d+)$!;
next unless $disk =~ m!^(\w+)-(\d+)-(\w+)-(\d+)$!; $name = $pool . '/' . $name;
$name = $pool . '/' . $disk;
} else { } else {
next; next;
} }
$zvol->{pool} = $pool;
$zvol->{name} = $name; $zvol->{name} = $name;
$zvol->{size} = zfs_parse_size($2); $zvol->{size} = zfs_parse_size($2);
if ($3 !~ /^-$/) { if ($3 !~ /^-$/) {
$zvol->{origin} = $3; $zvol->{origin} = $3;
} }
push @$list, $zvol; push @$list, $zvol;
} }
@ -271,7 +270,7 @@ sub zfs_get_lun_number {
sub zfs_list_zvol { sub zfs_list_zvol {
my ($scfg) = @_; my ($scfg) = @_;
my $text = zfs_request($scfg, 10, 'list', '-o', 'name,volsize,origin', '-Hr'); my $text = zfs_request($scfg, 10, 'list', '-o', 'name,volsize,origin', '-t', 'volume', '-Hr');
my $zvols = zfs_parse_zvol_list($text); my $zvols = zfs_parse_zvol_list($text);
return undef if !$zvols; return undef if !$zvols;
@ -279,8 +278,8 @@ sub zfs_list_zvol {
foreach my $zvol (@$zvols) { foreach my $zvol (@$zvols) {
my @values = split('/', $zvol->{name}); my @values = split('/', $zvol->{name});
my $pool = $values[0]; my $image = pop @values;
my $image = $values[1]; my $pool = join('/', @values);
next if $image !~ m/^((vm|base)-(\d+)-\S+)$/; next if $image !~ m/^((vm|base)-(\d+)-\S+)$/;
my $owner = $3; my $owner = $3;