[pbs-devel] [PATCH proxmox-backup 1/2] api/admin/datastore: rrd: do not include io_ticks for zfs datastores

[pbs-devel] [PATCH proxmox-backup 1/2] api/admin/datastore: rrd: do not include io_ticks for zfs datastores

[Dominik Csapak]

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

[pbs-devel] [PATCH proxmox-backup 2/2] ui: hide rrd chard for io delay if no io_ticks are returned

[Dominik Csapak]

it makes no sense to show a completely empty graph

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
 www/datastore/Summary.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/www/datastore/Summary.js b/www/datastore/Summary.js
index 1616bd57..c3769257 100644
--- a/www/datastore/Summary.js
+++ b/www/datastore/Summary.js
@@ -234,6 +234,8 @@ Ext.define('PBS.DataStoreSummary', {
 	},
 	{
 	    xtype: 'proxmoxRRDChart',
+	    itemId: 'ioDelayChart',
+	    hidden: true,
 	    title: gettext('IO Delay (ms)'),
 	    fields: ['io_delay'],
 	    fieldTitles: [gettext('IO Delay')],
@@ -288,6 +290,10 @@ Ext.define('PBS.DataStoreSummary', {
 	    },
 	});
 
+	me.mon(me.rrdstore, 'load', function(store, records, success) {
+	    me.down('#ioDelayChart').setVisible(!success || records[0]?.data?.io_ticks !== undefined);
+	}, undefined, { single: true });
+
 	me.query('proxmoxRRDChart').forEach((chart) => {
 	    chart.setStore(me.rrdstore);
 	});
-- 
2.30.2

Re: [pbs-devel] [PATCH proxmox-backup 2/2] ui: hide rrd chard for io delay if no io_ticks are returned

[Dominik Csapak]

sorry for the typo in the subject... (s/chard/chart/)

[pbs-devel] applied: [PATCH proxmox-backup 1/2] api/admin/datastore: rrd: do not include io_ticks for zfs datastores

[Dietmar Maurer]

applied both patches