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

fix #3967: enable ZFS dRAID creation via API

Browse Source 
It is possible to set the number of spares and the size of
data stripes via draidspares & dreaddata parameters.

Signed-off-by: Stefan Hrdlicka <s.hrdlicka@proxmox.com>
Tested-by: Lukas Wagner <l.wagner@proxmox.com>
This commit is contained in:
Stefan Hrdlicka
2022-11-10 14:24:48 +01:00
committed by Thomas Lamprecht
parent 8b06da647a
commit 59db1208c3
1 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
PVE/API2/Disks/ZFS.pm
View File

@ -280,6 +280,19 @@ __PACKAGE__->register_method ({
return $pool; return $pool;
}}); }});
my $draid_config_format = {
spares => {
type => 'integer',
minimum => 0,
description => 'Number of dRAID spares.',
},
data => {
type => 'integer',
minimum => 1,
description => 'The number of data devices per redundancy group. (dRAID)',
},
};
__PACKAGE__->register_method ({ __PACKAGE__->register_method ({
name => 'create', name => 'create',
path => '', path => '',
@ -298,12 +311,21 @@ __PACKAGE__->register_method ({
raidlevel => { raidlevel => {
type => 'string', type => 'string',
description => 'The RAID level to use.', description => 'The RAID level to use.',
enum => ['single', 'mirror', 'raid10', 'raidz', 'raidz2', 'raidz3'], enum => [
'single', 'mirror',
'raid10', 'raidz', 'raidz2', 'raidz3',
'draid', 'draid2', 'draid3',
],
}, },
devices => { devices => {
type => 'string', format => 'string-list', type => 'string', format => 'string-list',
description => 'The block devices you want to create the zpool on.', description => 'The block devices you want to create the zpool on.',
}, },
'draid-config' => {
type => 'string',
format => $draid_config_format,
optional => 1,
},
ashift => { ashift => {
type => 'integer', type => 'integer',
minimum => 9, minimum => 9,
@ -339,6 +361,13 @@ __PACKAGE__->register_method ({
my $devs = [PVE::Tools::split_list($param->{devices})]; my $devs = [PVE::Tools::split_list($param->{devices})];
my $raidlevel = $param->{raidlevel}; my $raidlevel = $param->{raidlevel};
my $compression = $param->{compression} // 'on'; my $compression = $param->{compression} // 'on';
my $draid_config = {};
if (exists $param->{'draid-config'}) {
$draid_config = PVE::JSONSchema::parse_property_string(
$draid_config_format, $param->{'draid-config'});
}
my $draid_data = $draid_config->{data};
my $draid_spares = $draid_config->{spares};
for my $dev (@$devs) { for my $dev (@$devs) {
$dev = PVE::Diskmanage::verify_blockdev_path($dev); $dev = PVE::Diskmanage::verify_blockdev_path($dev);
@ -376,6 +405,9 @@ __PACKAGE__->register_method ({
raidz => 3, raidz => 3,
raidz2 => 4, raidz2 => 4,
raidz3 => 5, raidz3 => 5,
draid => 3,
draid2 => 4,
draid3 => 5,
}; };
# sanity checks # sanity checks
@ -388,6 +420,22 @@ __PACKAGE__->register_method ({
die "$raidlevel needs at least $mindisks->{$raidlevel} disks\n" die "$raidlevel needs at least $mindisks->{$raidlevel} disks\n"
if $numdisks < $mindisks->{$raidlevel}; if $numdisks < $mindisks->{$raidlevel};
# draid checks
if ($raidlevel =~ m/^draid/) {
# bare minimum would be two drives:
# one parity & one data drive this code doesn't allow that because
# it makes no sense, at least one spare disk should be used
my $draidmin = $mindisks->{$raidlevel} - 2;
$draidmin += $draid_data if $draid_data;
$draidmin += $draid_spares if $draid_spares;
die "At least $draidmin disks needed for current dRAID config\n"
if $numdisks < $draidmin;
} else {
die "draidspares and/or draiddata set without using dRAID"
if ($draid_spares or $draid_data);
}
my $code = sub { my $code = sub {
for my $dev (@$devs) { for my $dev (@$devs) {
PVE::Diskmanage::assert_disk_unused($dev); PVE::Diskmanage::assert_disk_unused($dev);
@ -424,6 +472,11 @@ __PACKAGE__->register_method ({
} }
} elsif ($raidlevel eq 'single') { } elsif ($raidlevel eq 'single') {
push @$cmd, $devs->[0]; push @$cmd, $devs->[0];
} elsif ($raidlevel =~ m/^draid/) {
my $draid_cmd = $raidlevel;
$draid_cmd .= ":${draid_data}d" if $draid_data;
$draid_cmd .= ":${draid_spares}s" if $draid_spares;
push @$cmd, $draid_cmd, @$devs;
} else { } else {
push @$cmd, $raidlevel, @$devs; push @$cmd, $raidlevel, @$devs;
} }