Re: [pbs-devel] [PATCH proxmox-backup v9 10/26] pbs-api-types: add removable/is-available flag to DataStoreListItem

[Wolfgang Bumiller <w.bumiller@proxmox.com>]

On Tue, Apr 23, 2024 at 10:29:44AM +0200, Hannes Laimer wrote:
> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> ---
>  pbs-api-types/src/datastore.rs |  9 ++++++++-
>  src/api2/admin/datastore.rs    | 17 +++++++++--------
>  src/api2/status.rs             | 18 +++++++++++++++---
>  3 files changed, 32 insertions(+), 12 deletions(-)
> 
> diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
> index 9a71ce53..12a5d397 100644
> --- a/pbs-api-types/src/datastore.rs
> +++ b/pbs-api-types/src/datastore.rs
> @@ -432,6 +432,10 @@ impl DataStoreConfig {
>  pub struct DataStoreListItem {
>      pub store: String,
>      pub comment: Option<String>,
> +    /// Datastore is removable
> +    pub removable: bool,
> +    /// Datastore is available
> +    pub available: bool,
>      /// If the datastore is in maintenance mode, information about it
>      #[serde(skip_serializing_if = "Option::is_none")]
>      pub maintenance: Option<String>,
> @@ -1399,6 +1403,8 @@ pub struct DataStoreStatusListItem {
>      /// The available bytes of the underlying storage. (-1 on error)
>      #[serde(skip_serializing_if = "Option::is_none")]
>      pub avail: Option<u64>,
> +    /// The datastore is available, relevant if removable
> +    pub is_available: bool,
>      /// A list of usages of the past (last Month).
>      #[serde(skip_serializing_if = "Option::is_none")]
>      pub history: Option<Vec<Option<f64>>>,
> @@ -1423,12 +1429,13 @@ pub struct DataStoreStatusListItem {
>  }
>  
>  impl DataStoreStatusListItem {
> -    pub fn empty(store: &str, err: Option<String>) -> Self {
> +    pub fn empty(store: &str, err: Option<String>, is_available: bool) -> Self {
>          DataStoreStatusListItem {
>              store: store.to_owned(),
>              total: None,
>              used: None,
>              avail: None,
> +            is_available,
>              history: None,
>              history_start: None,
>              history_delta: None,
> diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
> index fd26f0db..57563028 100644
> --- a/src/api2/admin/datastore.rs
> +++ b/src/api2/admin/datastore.rs
> @@ -1262,8 +1262,8 @@ pub fn get_datastore_list(
>  
>      let mut list = Vec::new();
>  
> -    for (store, (_, data)) in &config.sections {
> -        let acl_path = &["datastore", store];
> +    for (store, (_, data)) in config.sections {
> +        let acl_path = &["datastore", &store];
>          let user_privs = user_info.lookup_privs(&auth_id, acl_path);
>          let allowed = (user_privs & (PRIV_DATASTORE_AUDIT | PRIV_DATASTORE_BACKUP)) != 0;
>  
> @@ -1274,15 +1274,16 @@ pub fn get_datastore_list(
>              }
>          }
>  
> +        let store_config: DataStoreConfig = serde_json::from_value(data)?;
> +        let is_available = pbs_datastore::is_datastore_available(&store_config);

^ is_datastore_available is called in a loop here, so it might make
sense to have a variant that gets a cached `MountInfo`.

> +
>          if allowed || allow_id {
>              list.push(DataStoreListItem {
>                  store: store.clone(),
> -                comment: if !allowed {
> -                    None
> -                } else {
> -                    data["comment"].as_str().map(String::from)
> -                },
> -                maintenance: data["maintenance-mode"].as_str().map(String::from),
> +                comment: if !allowed { None } else { store_config.comment },

^ since you're already modifying it - could be condensed to:
    comment: store_config.comment.filter(|_| allowed),
(but not important)

> +                removable: store_config.backing_device.is_some(),
> +                available: is_available,
> +                maintenance: store_config.maintenance_mode,
>              });
>          }
>      }


_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel