[pbs-devel] [PATCH] api/status: readd gc-status

Dominik Csapak d.csapak at proxmox.com
Fri Apr 29 12:07:12 CEST 2022


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 <d.csapak at proxmox.com>
---
 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<String>,
+    /// Status of last GC
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub gc_status: Option<GarbageCollectionStatus>,
 }
 
 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






More information about the pbs-devel mailing list