Re: [pbs-devel] [PATCH proxmox-backup v12 03/26] pbs-api-types: add backing-device to DataStoreConfig

["Fabian Grünbichler" <f.gruenbichler@proxmox.com>]

following the rest of the series.. `path` is now either
- the absolute path to the datastore directory (regular datastores)
- the relative path to the datastore directory on a removable device (removable datastores)

the schema only tells us it's a "Directory name". I see room for improvement there ;)

On September 4, 2024 4:11 pm, Hannes Laimer wrote:
> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> ---
>  pbs-api-types/src/datastore.rs | 27 ++++++++++++++++++++++++++-
>  1 file changed, 26 insertions(+), 1 deletion(-)
> 
> diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
> index a5704c93..863ed317 100644
> --- a/pbs-api-types/src/datastore.rs
> +++ b/pbs-api-types/src/datastore.rs
> @@ -160,6 +160,9 @@ pub const PRUNE_SCHEMA_KEEP_YEARLY: Schema =
>          .minimum(1)
>          .schema();
>  
> +/// Base directory where datastores are mounted
> +pub const DATASTORE_MOUNT_DIR: &str = "/mnt/datastore";
> +
>  #[api]
>  #[derive(Debug, Default, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
>  #[serde(rename_all = "lowercase")]
> @@ -273,6 +276,12 @@ pub const DATASTORE_TUNING_STRING_SCHEMA: Schema = StringSchema::new("Datastore
>              format: &ApiStringFormat::PropertyString(&MaintenanceMode::API_SCHEMA),
>              type: String,
>          },
> +        "backing-device": {
> +            description: "The UUID of the filesystem partition for removable datastores.",
> +            optional: true,
> +            format: &proxmox_schema::api_types::UUID_FORMAT,
> +            type: String,
> +        }
>      }
>  )]
>  #[derive(Serialize, Deserialize, Updater, Clone, PartialEq)]
> @@ -320,6 +329,11 @@ pub struct DataStoreConfig {
>      /// Maintenance mode, type is either 'offline' or 'read-only', message should be enclosed in "
>      #[serde(skip_serializing_if = "Option::is_none")]
>      pub maintenance_mode: Option<String>,
> +
> +    /// The UUID of the device(for removable datastores)
> +    #[updater(skip)]
> +    #[serde(skip_serializing_if = "Option::is_none")]
> +    pub backing_device: Option<String>,
>  }
>  
>  #[api]
> @@ -354,12 +368,23 @@ impl DataStoreConfig {
>              notification_mode: None,
>              tuning: None,
>              maintenance_mode: None,
> +            backing_device: None,
>          }
>      }
>  
>      /// Returns the absolute path to the datastore content.
>      pub fn absolute_path(&self) -> String {
> -        self.path.clone()
> +        if self.backing_device.is_some() {
> +            format!("{DATASTORE_MOUNT_DIR}/{}", self.name)

see comment on patch #7

> +        } else {
> +            self.path.clone()
> +        }
> +    }
> +
> +    pub fn get_mount_point(&self) -> Option<String> {
> +        self.backing_device
> +            .is_some()
> +            .then(|| format!("{DATASTORE_MOUNT_DIR}/{}", self.name))
>      }
>  
>      pub fn get_maintenance_mode(&self) -> Option<MaintenanceMode> {
> -- 
> 2.39.2
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
> 
> 
> 


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