Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-26 10:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix/disk usage zfs (#587)

Browse Source 
* fixes disk usage gets

* fix whitespace issues
This commit is contained in:
Keagan McClelland
2021-10-05 16:25:23 -06:00
committed by Aiden McClelland
parent 169039c69b
commit 338a034073
1 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
appmgr/src/system.rs
View File

@@ -1,5 +1,6 @@
use std::fmt;
use futures::future::try_join_all;
use rpc_toolkit::command;
use serde::ser::SerializeStruct;
use serde::{Deserialize, Deserializer, Serialize, Serializer};
@@ -572,36 +573,66 @@ async fn get_mem_info() -> Result<MetricsMemory, Error> {
}
async fn get_disk_info() -> Result<MetricsDisk, Error> {
tokio::task::spawn_blocking(move || {
let fs_res = nix::sys::statfs::statfs("/").map_err(|e| {
use crate::util::Invoke;
let mut size_cmd = tokio::process::Command::new("zpool");
let size_task = size_cmd
.arg("list")
.arg("-Hp")
.arg("-o")
.arg("size")
.arg("embassy-data")
.invoke(ErrorKind::ParseSysInfo);
let mut alloc_cmd = tokio::process::Command::new("zpool");
let alloc_task = alloc_cmd
.arg("list")
.arg("-Hp")
.arg("-o")
.arg("allocated")
.arg("embassy-data")
.invoke(ErrorKind::ParseSysInfo);
let mut free_cmd = tokio::process::Command::new("zpool");
let free_task = free_cmd
.arg("list")
.arg("-Hp")
.arg("-o")
.arg("free")
.arg("embassy-data")
.invoke(ErrorKind::ParseSysInfo);
let (size_bytes, alloc_bytes, free_bytes) =
futures::try_join!(size_task, alloc_task, free_task)?;
let size = String::from_utf8(size_bytes)?
.trim()
.parse::<f64>()
.map_err(|e| {
Error::new(
anyhow::anyhow!("statfs panicked: {}", e),
anyhow::anyhow!("Could not parse disk size: {}", e),
ErrorKind::ParseSysInfo,
)
})?;
let block_size = fs_res.block_size() as u64;
let blocks = fs_res.blocks();
let blocks_available = fs_res.blocks_available();
fn to_gigs(n: u64) -> GigaBytes {
GigaBytes(n as f64 / (1u64 << 30) as f64)
}
let size = to_gigs(blocks * block_size);
let used = to_gigs(block_size * (blocks - blocks_available));
let available = to_gigs(block_size * blocks_available);
let used_percentage = Percentage(used.0 / size.0 * 100.0);
Ok(MetricsDisk {
size,
used,
available,
used_percentage,
})
let alloc = String::from_utf8(alloc_bytes)?
.trim()
.parse::<f64>()
.map_err(|e| {
Error::new(
anyhow::anyhow!("Could not parse disk alloc: {}", e),
ErrorKind::ParseSysInfo,
)
})?;
let free = String::from_utf8(free_bytes)?
.trim()
.parse::<f64>()
.map_err(|e| {
Error::new(
anyhow::anyhow!("Could not parse disk alloc: {}", e),
ErrorKind::ParseSysInfo,
)
})?;
Ok(MetricsDisk {
size: GigaBytes(size / 1_000_000_000.0),
used: GigaBytes(alloc / 1_000_000_000.0),
available: GigaBytes(free / 1_000_000_000.0),
used_percentage: Percentage(alloc / size * 100.0),
})
.await
.map_err(|e| Error {
source: anyhow::anyhow!("statfs panicked: {}", e),
kind: ErrorKind::ParseSysInfo,
revision: None,
})?
}
#[command(subcommands(share_stats))]