[pbs-devel] [PATCH v2 proxmox-backup 2/2] status: use Option on avail/used datastore attrs
Gabriel Goller
g.goller at proxmox.com
Mon Dec 11 09:59:02 CET 2023
Instead of returning -1 if we can't get the attributes, we use an
Option which will not be serialized on `None`.
Signed-off-by: Gabriel Goller <g.goller at proxmox.com>
---
pbs-api-types/src/datastore.rs | 19 +++++++++++--------
src/api2/status.rs | 6 +++---
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
index d4ead1d1..74f610d1 100644
--- a/pbs-api-types/src/datastore.rs
+++ b/pbs-api-types/src/datastore.rs
@@ -1302,12 +1302,15 @@ pub struct DataStoreStatus {
/// Status of a Datastore
pub struct DataStoreStatusListItem {
pub store: String,
- /// The Size of the underlying storage in bytes. (-1 on error)
- pub total: i64,
- /// The used bytes of the underlying storage. (-1 on error)
- pub used: i64,
+ /// The Size of the underlying storage in bytes.
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub total: Option<u64>,
+ /// The used bytes of the underlying storage.
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub used: Option<u64>,
/// The available bytes of the underlying storage. (-1 on error)
- pub avail: i64,
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub avail: Option<u64>,
/// A list of usages of the past (last Month).
#[serde(skip_serializing_if = "Option::is_none")]
pub history: Option<Vec<Option<f64>>>,
@@ -1335,9 +1338,9 @@ impl DataStoreStatusListItem {
pub fn empty(store: &str, err: Option<String>) -> Self {
DataStoreStatusListItem {
store: store.to_owned(),
- total: -1,
- used: -1,
- avail: -1,
+ total: None,
+ used: None,
+ avail: None,
history: None,
history_start: None,
history_delta: None,
diff --git a/src/api2/status.rs b/src/api2/status.rs
index ff7d4cbd..78bc06b5 100644
--- a/src/api2/status.rs
+++ b/src/api2/status.rs
@@ -68,9 +68,9 @@ pub async fn datastore_status(
let mut entry = DataStoreStatusListItem {
store: store.clone(),
- total: status.total as i64,
- used: status.used as i64,
- avail: status.available as i64,
+ total: Some(status.total),
+ used: Some(status.used),
+ avail: Some(status.available),
history: None,
history_start: None,
history_delta: None,
--
2.39.2
More information about the pbs-devel
mailing list