From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <a.lauterer@proxmox.com> 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 30B9F87EA for <pve-devel@lists.proxmox.com>; Tue, 22 Aug 2023 11:05:30 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 18A029F72 for <pve-devel@lists.proxmox.com>; Tue, 22 Aug 2023 11:05:00 +0200 (CEST) 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 <pve-devel@lists.proxmox.com>; Tue, 22 Aug 2023 11:04:58 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4701943285 for <pve-devel@lists.proxmox.com>; Tue, 22 Aug 2023 11:04:58 +0200 (CEST) From: Aaron Lauterer <a.lauterer@proxmox.com> To: pve-devel@lists.proxmox.com Date: Tue, 22 Aug 2023 11:04:56 +0200 Message-Id: <20230822090456.929773-3-a.lauterer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230822090456.929773-1-a.lauterer@proxmox.com> References: <20230822090456.929773-1-a.lauterer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.084 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [rec.data] Subject: [pve-devel] [PATCH widget-toolkit 2/2] DiskList: render osdid-list if present X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Tue, 22 Aug 2023 09:05:30 -0000 Render all OSD IDs in 'osdid-list' if the parameter is present. It is possible to have multiple OSD daemons on a disk. We want to list them all in the UI. Fall back to the 'osdid' parameter if 'osdid-list' is not available. We check rec.data['osdid-list'] against its general truthiness as it might not be present at all or null. Signed-off-by: Aaron Lauterer <a.lauterer@proxmox.com> --- src/panel/DiskList.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/panel/DiskList.js b/src/panel/DiskList.js index c5a0050..4808f5c 100644 --- a/src/panel/DiskList.js +++ b/src/panel/DiskList.js @@ -220,7 +220,11 @@ Ext.define('Proxmox.DiskList', { let extendedInfo = ''; if (rec) { let types = []; - if (rec.data.osdid !== undefined && rec.data.osdid >= 0) { + if (rec.data['osdid-list'] && rec.data['osdid-list'].length > 0) { + for (const id of rec.data['osdid-list'].sort()) { + types.push(`OSD.${id.toString()}`); + } + } else if (rec.data.osdid !== undefined && rec.data.osdid >= 0) { types.push(`OSD.${rec.data.osdid.toString()}`); } if (rec.data.journals > 0) { -- 2.39.2