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 1A1716B389 for ; Tue, 26 Jan 2021 12:45:36 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1841E15974 for ; Tue, 26 Jan 2021 12:45:36 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 id 41B3A15949 for ; Tue, 26 Jan 2021 12:45:35 +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 090BC46115 for ; Tue, 26 Jan 2021 12:45:35 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 26 Jan 2021 12:45:17 +0100 Message-Id: <20210126114530.8753-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210126114530.8753-1-f.ebner@proxmox.com> References: <20210126114530.8753-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.007 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [disks.pm] Subject: [pve-devel] [PATCH storage 01/14] Disks: return correct journal disk candidates 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: Tue, 26 Jan 2021 11:45:36 -0000 Previously any GPT initialized disk without an osdid (i.e. equal to -1) would be included in the list of journal disk candidates, for example a ZFS disk. But the OSD creation API call will fail for those. To fix it, re-use the condition from the corresponding check in that API call (in PVE/API2/Ceph/OSD.pm). Now, included disks are unused disks, those with usage 'partitions' and GPT, and those with usage 'LVM'. Signed-off-by: Fabian Ebner --- PVE/API2/Disks.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PVE/API2/Disks.pm b/PVE/API2/Disks.pm index 807e9b2..c0456be 100644 --- a/PVE/API2/Disks.pm +++ b/PVE/API2/Disks.pm @@ -137,7 +137,10 @@ __PACKAGE__->register_method ({ my $entry = $disks->{$disk}; if ($type eq 'journal_disks') { next if $entry->{osdid} >= 0; - next if !($entry->{gpt} || !$entry->{used} || $entry->{used} eq 'LVM'); + if (my $usage = $entry->{used}) { + next if !($usage eq 'partitions' && $entry->{gpt} + || $usage eq 'LVM'); + } } elsif ($type eq 'unused') { next if $entry->{used}; } elsif ($type ne '') { -- 2.20.1