From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.csapak@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 A19A460866
for <pbs-devel@lists.proxmox.com>; Tue, 11 Jan 2022 10:27:09 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 923531C05A
for <pbs-devel@lists.proxmox.com>; Tue, 11 Jan 2022 10:27:09 +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) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id E18F91C047
for <pbs-devel@lists.proxmox.com>; Tue, 11 Jan 2022 10:27:08 +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 B9BB546C42
for <pbs-devel@lists.proxmox.com>; Tue, 11 Jan 2022 10:27:08 +0100 (CET)
From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Tue, 11 Jan 2022 10:27:07 +0100
Message-Id: <20220111092708.1683867-1-d.csapak@proxmox.com>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.164 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
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [datastore.rs]
Subject: [pbs-devel] [PATCH proxmox-backup 1/2] api/admin/datastore: rrd: do
not include io_ticks for zfs datastores
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 11 Jan 2022 09:27:09 -0000
since it is not possible to collect them, do not return them here either
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/api2/admin/datastore.rs | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
index 4073c96b..263ea96f 100644
--- a/src/api2/admin/datastore.rs
+++ b/src/api2/admin/datastore.rs
@@ -1567,14 +1567,24 @@ pub fn get_rrd_stats(
_param: Value,
) -> Result<Value, Error> {
+ let datastore = DataStore::lookup_datastore(&store)?;
+ let disk_manager = crate::tools::disks::DiskManage::new();
+
+ let mut rrd_fields = vec![
+ "total", "used",
+ "read_ios", "read_bytes",
+ "write_ios", "write_bytes",
+ ];
+
+ // we do not have io_ticks for zpools, so don't include them
+ match disk_manager.find_mounted_device(&datastore.base_path()) {
+ Ok(Some((fs_type, _, _))) if fs_type.as_str() == "zfs" => {},
+ _ => rrd_fields.push("io_ticks"),
+ };
+
create_value_from_rrd(
&format!("datastore/{}", store),
- &[
- "total", "used",
- "read_ios", "read_bytes",
- "write_ios", "write_bytes",
- "io_ticks",
- ],
+ &rrd_fields,
timeframe,
cf,
)
--
2.30.2