From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 98CF4B95C9 for ; Mon, 11 Dec 2023 09:59:07 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7FFF41341F for ; Mon, 11 Dec 2023 09:59:07 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 11 Dec 2023 09:59:06 +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 1E08344EEA for ; Mon, 11 Dec 2023 09:59:06 +0100 (CET) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Mon, 11 Dec 2023 09:59:02 +0100 Message-Id: <20231211085902.20747-3-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231211085902.20747-1-g.goller@proxmox.com> References: <20231211085902.20747-1-g.goller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.147 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH v2 proxmox-backup 2/2] status: use Option on avail/used datastore attrs X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Dec 2023 08:59:07 -0000 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 --- 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, + /// The used bytes of the underlying storage. + #[serde(skip_serializing_if = "Option::is_none")] + pub used: Option, /// The available bytes of the underlying storage. (-1 on error) - pub avail: i64, + #[serde(skip_serializing_if = "Option::is_none")] + pub avail: Option, /// A list of usages of the past (last Month). #[serde(skip_serializing_if = "Option::is_none")] pub history: Option>>, @@ -1335,9 +1338,9 @@ impl DataStoreStatusListItem { pub fn empty(store: &str, err: Option) -> 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