From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 845998E006 for ; Thu, 10 Nov 2022 14:25:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6DA8D27471 for ; Thu, 10 Nov 2022 14:25:24 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 10 Nov 2022 14:25:22 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5A1BC44878 for ; Thu, 10 Nov 2022 14:25:22 +0100 (CET) From: Stefan Hrdlicka To: pve-devel@lists.proxmox.com Date: Thu, 10 Nov 2022 14:24:48 +0100 Message-Id: <20221110132450.567121-2-s.hrdlicka@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221110132450.567121-1-s.hrdlicka@proxmox.com> References: <20221110132450.567121-1-s.hrdlicka@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.036 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH V4 storage 1/3] fix #3967: enable ZFS dRAID creation via API X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Nov 2022 13:25:24 -0000 It is possible to set the number of spares and the size of data stripes via draidspares & dreaddata parameters. Signed-off-by: Stefan Hrdlicka --- PVE/API2/Disks/ZFS.pm | 55 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Disks/ZFS.pm b/PVE/API2/Disks/ZFS.pm index a4d4aa2..d1bcbcb 100644 --- a/PVE/API2/Disks/ZFS.pm +++ b/PVE/API2/Disks/ZFS.pm @@ -285,6 +285,19 @@ __PACKAGE__->register_method ({ 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 ({ name => 'create', path => '', @@ -303,12 +316,21 @@ __PACKAGE__->register_method ({ raidlevel => { type => 'string', description => 'The RAID level to use.', - enum => ['single', 'mirror', 'raid10', 'raidz', 'raidz2', 'raidz3'], + enum => [ + 'single', 'mirror', + 'raid10', 'raidz', 'raidz2', 'raidz3', + 'draid', 'draid2', 'draid3', + ], }, devices => { type => 'string', format => 'string-list', description => 'The block devices you want to create the zpool on.', }, + 'draid-config' => { + type => 'string', + format => $draid_config_format, + optional => 1, + }, ashift => { type => 'integer', minimum => 9, @@ -344,6 +366,13 @@ __PACKAGE__->register_method ({ my $devs = [PVE::Tools::split_list($param->{devices})]; my $raidlevel = $param->{raidlevel}; 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) { $dev = PVE::Diskmanage::verify_blockdev_path($dev); @@ -381,6 +410,9 @@ __PACKAGE__->register_method ({ raidz => 3, raidz2 => 4, raidz3 => 5, + draid => 3, + draid2 => 4, + draid3 => 5, }; # sanity checks @@ -393,6 +425,22 @@ __PACKAGE__->register_method ({ die "$raidlevel needs at least $mindisks->{$raidlevel} disks\n" 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 { for my $dev (@$devs) { PVE::Diskmanage::assert_disk_unused($dev); @@ -429,6 +477,11 @@ __PACKAGE__->register_method ({ } } elsif ($raidlevel eq 'single') { 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 { push @$cmd, $raidlevel, @$devs; } -- 2.30.2