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

disk manage: move "draid-config set only on draid level" assertion

Browse Source 
so that there is a better code locality and also we avoid forgetting
to adapt the check for each specific draid-config parameter if a new
one gets added or an existing one changed.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2022-11-11 09:22:19 +01:00
parent 59db1208c3
commit 8a5ffcd991
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -363,6 +363,7 @@ __PACKAGE__->register_method ({
my $compression = $param->{compression} // 'on'; my $compression = $param->{compression} // 'on';
my $draid_config = {}; my $draid_config = {};
if (exists $param->{'draid-config'}) { if (exists $param->{'draid-config'}) {
die "draid-config set without using dRAID level\n" if $raidlevel !~ m/^draid/;
$draid_config = PVE::JSONSchema::parse_property_string( $draid_config = PVE::JSONSchema::parse_property_string(
$draid_config_format, $param->{'draid-config'}); $draid_config_format, $param->{'draid-config'});
} }
@ -431,9 +432,6 @@ __PACKAGE__->register_method ({
die "At least $draidmin disks needed for current dRAID config\n" die "At least $draidmin disks needed for current dRAID config\n"
if $numdisks < $draidmin; 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 {