From 8550de7403c689a847d7479d52c7d0bd7d494ad9 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Fri, 29 Apr 2022 12:07:12 +0200 Subject: [PATCH] api: status: return gc-status again Returning the GC status was dropped by mistake in commit 762f7d15 ("datastore status: factor out api type DataStoreStatusListItem") As this is considered a breaking change which we also felt, due to the gc-status being used in the web interface for the datastore overview list (not the dashboard), re add it. Fixes: 762f7d15 Signed-off-by: Dominik Csapak [ T: add reference to breaking commit, reword message ] Signed-off-by: Thomas Lamprecht --- 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);