[pbs-devel] [PATCH proxmox-backup v12 02/26] config: factor out method to get the absolute datastore path

[Fabian Grünbichler]

On September 4, 2024 4:11 pm, Hannes Laimer wrote:
> From: Dietmar Maurer <dietmar at proxmox.com>

a reason for such a change is always nice to have, e.g.:

removable datastores will have a PBS-managed mountpoint as path, direct
access to the field needs to be replaced with a helper that can account
for this.

> 
> Signed-off-by: Hannes Laimer <h.laimer at proxmox.com>
> ---
>  pbs-api-types/src/datastore.rs   |  5 +++++
>  pbs-datastore/src/datastore.rs   | 11 +++++++----
>  src/api2/node/disks/directory.rs |  4 ++--
>  src/bin/proxmox-backup-proxy.rs  |  4 ++--
>  4 files changed, 16 insertions(+), 8 deletions(-)
> 
> diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs
> index 31767417..a5704c93 100644
> --- a/pbs-api-types/src/datastore.rs
> +++ b/pbs-api-types/src/datastore.rs
> @@ -357,6 +357,11 @@ impl DataStoreConfig {
>          }
>      }
>  
> +    /// Returns the absolute path to the datastore content.
> +    pub fn absolute_path(&self) -> String {
> +        self.path.clone()
> +    }
> +
>      pub fn get_maintenance_mode(&self) -> Option<MaintenanceMode> {
>          self.maintenance_mode.as_ref().and_then(|str| {
>              MaintenanceMode::deserialize(proxmox_schema::de::SchemaDeserializer::new(
> diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs
> index d0f3c53a..fb37bd5a 100644
> --- a/pbs-datastore/src/datastore.rs
> +++ b/pbs-datastore/src/datastore.rs
> @@ -178,7 +178,7 @@ impl DataStore {
>              )?;
>              Arc::new(ChunkStore::open(
>                  name,
> -                &config.path,
> +                config.absolute_path(),
>                  tuning.sync_level.unwrap_or_default(),
>              )?)
>          };
> @@ -262,8 +262,11 @@ impl DataStore {
>              DatastoreTuning::API_SCHEMA
>                  .parse_property_string(config.tuning.as_deref().unwrap_or(""))?,
>          )?;
> -        let chunk_store =
> -            ChunkStore::open(&name, &config.path, tuning.sync_level.unwrap_or_default())?;
> +        let chunk_store = ChunkStore::open(
> +            &name,
> +            config.absolute_path(),
> +            tuning.sync_level.unwrap_or_default(),
> +        )?;
>          let inner = Arc::new(Self::with_store_and_config(
>              Arc::new(chunk_store),
>              config,
> @@ -1387,7 +1390,7 @@ impl DataStore {
>              bail!("datastore is currently in use");
>          }
>  
> -        let base = PathBuf::from(&datastore_config.path);
> +        let base = PathBuf::from(datastore_config.absolute_path());
>  
>          let mut ok = true;
>          if destroy_data {
> diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs
> index e971f40d..c0c53d84 100644
> --- a/src/api2/node/disks/directory.rs
> +++ b/src/api2/node/disks/directory.rs
> @@ -247,12 +247,12 @@ pub fn delete_datastore_disk(name: String) -> Result<(), Error> {
>      let (config, _) = pbs_config::datastore::config()?;
>      let datastores: Vec<DataStoreConfig> = config.convert_to_typed_array("datastore")?;
>      let conflicting_datastore: Option<DataStoreConfig> =
> -        datastores.into_iter().find(|ds| ds.path == path);
> +        datastores.into_iter().find(|ds| ds.absolute_path() == path);
>  
>      if let Some(conflicting_datastore) = conflicting_datastore {
>          bail!(
>              "Can't remove '{}' since it's required by datastore '{}'",
> -            conflicting_datastore.path,
> +            conflicting_datastore.absolute_path(),
>              conflicting_datastore.name
>          );
>      }
> diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs
> index 041f3aff..6ccf2f96 100644
> --- a/src/bin/proxmox-backup-proxy.rs
> +++ b/src/bin/proxmox-backup-proxy.rs
> @@ -1132,8 +1132,8 @@ fn collect_disk_stats_sync() -> (DiskStat, Vec<DiskStat>) {
>                  {
>                      continue;
>                  }
> -                let path = std::path::Path::new(&config.path);
> -                datastores.push(gather_disk_stats(disk_manager.clone(), path, &config.name));
> +                let path = std::path::PathBuf::from(config.absolute_path());
> +                datastores.push(gather_disk_stats(disk_manager.clone(), &path, &config.name));
>              }
>          }
>          Err(err) => {
> -- 
> 2.39.2
> 
> 
> 
> _______________________________________________
> pbs-devel mailing list
> pbs-devel at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
> 
> 
>