tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <d.csapak@proxmox.com>
 [ T: add reference to breaking commit, reword message ]
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Dominik Csapak 2022-04-29 12:07:12 +02:00 committed by Thomas Lamprecht
parent 0f198b82f5
commit 8550de7403
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pbs-api-types/src/datastore.rs
View File

@ -975,6 +975,9 @@ pub struct DataStoreStatusListItem {
/// An error description, for example, when the datastore could not be looked up /// An error description, for example, when the datastore could not be looked up
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub error: Option<String>, 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 { pub const ADMIN_DATASTORE_LIST_SNAPSHOTS_RETURN_TYPE: ReturnType = ReturnType {

2
src/api2/status.rs
View File

@ -63,6 +63,7 @@ pub fn datastore_status(
history_delta: None, history_delta: None,
estimated_full_date: None, estimated_full_date: None,
error: Some(err.to_string()), error: Some(err.to_string()),
gc_status: None,
}); });
continue; continue;
} }
@ -79,6 +80,7 @@ pub fn datastore_status(
history_delta: None, history_delta: None,
estimated_full_date: None, estimated_full_date: None,
error: None, error: None,
gc_status: Some(datastore.last_gc_status()),
}; };
let rrd_dir = format!("datastore/{}", store); let rrd_dir = format!("datastore/{}", store);