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 870DFB620 for ; Fri, 29 Apr 2022 12:07:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7E6459BE0 for ; Fri, 29 Apr 2022 12:07:13 +0200 (CEST) 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 id 049759BD7 for ; Fri, 29 Apr 2022 12:07:13 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C627042FDB for ; Fri, 29 Apr 2022 12:07:12 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Fri, 29 Apr 2022 12:07:12 +0200 Message-Id: <20220429100712.1104206-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.122 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 Subject: [pbs-devel] [PATCH] api/status: readd gc-status 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: Fri, 29 Apr 2022 10:07:13 -0000 this was removed during the recent cleanup of this api call, and we missed that the gc-status was used in the gui for the datastore overview list (not the dashboard), so simply readd it Signed-off-by: Dominik Csapak --- pbs-api-types/src/datastore.rs | 3 +++ src/api2/status.rs | 2 ++ 2 files changed, 5 insertions(+) diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs index df891cac..e0b900d9 100644 --- a/pbs-api-types/src/datastore.rs +++ b/pbs-api-types/src/datastore.rs @@ -975,6 +975,9 @@ pub struct DataStoreStatusListItem { /// An error description, for example, when the datastore could not be looked up #[serde(skip_serializing_if = "Option::is_none")] pub error: Option, + /// Status of last GC + #[serde(skip_serializing_if = "Option::is_none")] + pub gc_status: Option, } pub const ADMIN_DATASTORE_LIST_SNAPSHOTS_RETURN_TYPE: ReturnType = ReturnType { diff --git a/src/api2/status.rs b/src/api2/status.rs index 51cb345b..45aa7fd7 100644 --- a/src/api2/status.rs +++ b/src/api2/status.rs @@ -63,6 +63,7 @@ pub fn datastore_status( history_delta: None, estimated_full_date: None, error: Some(err.to_string()), + gc_status: None, }); continue; } @@ -79,6 +80,7 @@ pub fn datastore_status( history_delta: None, estimated_full_date: None, error: None, + gc_status: Some(datastore.last_gc_status()), }; let rrd_dir = format!("datastore/{}", store); -- 2.30.2