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

zfs: white space cleanups

Browse Source
This commit is contained in:
Dietmar Maurer
2015-01-22 09:45:32 +01:00
parent 34eaae3f8d
commit 6b5bca68e6
1 changed files with 70 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
PVE/Storage/ZFSPlugin.pm
View File

@ -106,8 +106,8 @@ sub zfs_get_lu_name {
sub zfs_add_lun_mapping_entry { sub zfs_add_lun_mapping_entry {
my ($class, $scfg, $zvol, $guid) = @_; my ($class, $scfg, $zvol, $guid) = @_;
if (! defined($guid)) { if (!defined($guid)) {
$guid = $class->zfs_get_lu_name($scfg, $zvol); $guid = $class->zfs_get_lu_name($scfg, $zvol);
} }
$class->zfs_request($scfg, undef, 'add_view', $guid); $class->zfs_request($scfg, undef, 'add_view', $guid);
@ -161,48 +161,48 @@ sub type {
sub plugindata { sub plugindata {
return { return {
content => [ {images => 1}, { images => 1 }], content => [ {images => 1}, { images => 1 }],
}; };
} }
sub properties { sub properties {
return { return {
iscsiprovider => { iscsiprovider => {
description => "iscsi provider", description => "iscsi provider",
type => 'string', type => 'string',
}, },
# this will disable write caching on comstar and istgt. # this will disable write caching on comstar and istgt.
# it is not implemented for iet. iet blockio always operates with # it is not implemented for iet. iet blockio always operates with
# writethrough caching when not in readonly mode # writethrough caching when not in readonly mode
nowritecache => { nowritecache => {
description => "disable write caching on the target", description => "disable write caching on the target",
type => 'boolean', type => 'boolean',
}, },
comstar_tg => { comstar_tg => {
description => "target group for comstar views", description => "target group for comstar views",
type => 'string', type => 'string',
}, },
comstar_hg => { comstar_hg => {
description => "host group for comstar views", description => "host group for comstar views",
type => 'string', type => 'string',
}, },
}; };
} }
sub options { sub options {
return { return {
nodes => { optional => 1 }, nodes => { optional => 1 },
disable => { optional => 1 }, disable => { optional => 1 },
portal => { fixed => 1 }, portal => { fixed => 1 },
target => { fixed => 1 }, target => { fixed => 1 },
pool => { fixed => 1 }, pool => { fixed => 1 },
blocksize => { fixed => 1 }, blocksize => { fixed => 1 },
iscsiprovider => { fixed => 1 }, iscsiprovider => { fixed => 1 },
nowritecache => { optional => 1 }, nowritecache => { optional => 1 },
sparse => { optional => 1 }, sparse => { optional => 1 },
comstar_hg => { optional => 1 }, comstar_hg => { optional => 1 },
comstar_tg => { optional => 1 }, comstar_tg => { optional => 1 },
content => { optional => 1 }, content => { optional => 1 },
}; };
} }
@ -212,7 +212,7 @@ sub parse_volname {
my ($class, $volname) = @_; my ($class, $volname) = @_;
if ($volname =~ m/^(((base|vm)-(\d+)-\S+)\/)?((base)?(vm)?-(\d+)-\S+)$/) { if ($volname =~ m/^(((base|vm)-(\d+)-\S+)\/)?((base)?(vm)?-(\d+)-\S+)$/) {
return ('images', $5, $8, $2, $4, $6); return ('images', $5, $8, $2, $4, $6);
} }
die "unable to parse zfs volume name '$volname'\n"; die "unable to parse zfs volume name '$volname'\n";
@ -307,15 +307,13 @@ sub free_image {
my ($vtype, $name, $vmid) = $class->parse_volname($volname); my ($vtype, $name, $vmid) = $class->parse_volname($volname);
$class->zfs_delete_lu($scfg, $name); $class->zfs_delete_lu($scfg, $name);
eval {
$class->zfs_delete_zvol($scfg, $name); eval { $class->zfs_delete_zvol($scfg, $name); };
}; if (my $err = $@) {
do {
my $err = $@;
my $guid = $class->zfs_create_lu($scfg, $name); my $guid = $class->zfs_create_lu($scfg, $name);
$class->zfs_add_lun_mapping_entry($scfg, $name, $guid); $class->zfs_add_lun_mapping_entry($scfg, $name, $guid);
die $err; die $err;
} if $@; }
return undef; return undef;
} }
@ -329,31 +327,31 @@ sub list_images {
if (my $dat = $cache->{zfs}->{$zfspool}) { if (my $dat = $cache->{zfs}->{$zfspool}) {
foreach my $image (keys %$dat) { foreach my $image (keys %$dat) {
my $volname = $dat->{$image}->{name}; my $volname = $dat->{$image}->{name};
my $parent = $dat->{$image}->{parent}; my $parent = $dat->{$image}->{parent};
my $volid = undef; my $volid = undef;
if ($parent && $parent =~ m/^(\S+)@(\S+)$/) { if ($parent && $parent =~ m/^(\S+)@(\S+)$/) {
my ($basename) = ($1); my ($basename) = ($1);
$volid = "$storeid:$basename/$volname"; $volid = "$storeid:$basename/$volname";
} else { } else {
$volid = "$storeid:$volname"; $volid = "$storeid:$volname";
} }
my $owner = $dat->{$volname}->{vmid}; my $owner = $dat->{$volname}->{vmid};
if ($vollist) { if ($vollist) {
my $found = grep { $_ eq $volid } @$vollist; my $found = grep { $_ eq $volid } @$vollist;
next if !$found; next if !$found;
} else { } else {
next if defined ($vmid) && ($owner ne $vmid); next if defined ($vmid) && ($owner ne $vmid);
} }
my $info = $dat->{$volname}; my $info = $dat->{$volname};
$info->{volid} = $volid; $info->{volid} = $volid;
push @$res, $info; push @$res, $info;
} }
} }
return $res; return $res;
@ -368,9 +366,9 @@ sub status {
my $active = 0; my $active = 0;
eval { eval {
($free, $used) = $class->zfs_get_pool_stats($scfg); ($free, $used) = $class->zfs_get_pool_stats($scfg);
$active = 1; $active = 1;
$total = $free + $used; $total = $free + $used;
}; };
warn $@ if $@; warn $@ if $@;
@ -430,7 +428,7 @@ sub volume_snapshot_rollback {
if (/$scfg->{pool}\/$volname/) { if (/$scfg->{pool}\/$volname/) {
s/^.*@//; s/^.*@//;
$recentsnap = $_; $recentsnap = $_;
} }
} }
if ($snap ne $recentsnap) { if ($snap ne $recentsnap) {
die "cannot rollback, more recent snapshots exist\n"; die "cannot rollback, more recent snapshots exist\n";
@ -455,21 +453,21 @@ sub volume_has_feature {
my ($class, $scfg, $feature, $storeid, $volname, $snapname, $running) = @_; my ($class, $scfg, $feature, $storeid, $volname, $snapname, $running) = @_;
my $features = { my $features = {
snapshot => { current => 1, snap => 1}, snapshot => { current => 1, snap => 1},
clone => { base => 1}, clone => { base => 1},
template => { current => 1}, template => { current => 1},
copy => { base => 1, current => 1}, copy => { base => 1, current => 1},
}; };
my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) = my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
$class->parse_volname($volname); $class->parse_volname($volname);
my $key = undef; my $key = undef;
if ($snapname) { if ($snapname) {
$key = 'snap'; $key = 'snap';
} else { } else {
$key = $isBase ? 'base' : 'current'; $key = $isBase ? 'base' : 'current';
} }
return 1 if $features->{$feature}->{$key}; return 1 if $features->{$feature}->{$key};