tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

api/admin/datastore: rrd: do not include io_ticks for zfs datastores 

since it is not possible to collect them, do not return them here either

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2022-01-11 10:27:07 +01:00 committed by Dietmar Maurer
parent 7c069e82d1
commit f27b6086b1
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/api2/admin/datastore.rs
View File

@ -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,
)