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

[Wolfgang Bumiller]

On Tue, Apr 23, 2024 at 10:29:36AM +0200, Hannes Laimer wrote:
> From: Dietmar Maurer <dietmar at proxmox.com>
> 
> Signed-off-by: Hannes Laimer <h.laimer at proxmox.com>
> Signed-off-by: Dietmar Maurer <dietmar 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 8a8ec12d..2eb3741a 100644
> --- a/pbs-api-types/src/datastore.rs
> +++ b/pbs-api-types/src/datastore.rs
> @@ -335,6 +335,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 f95da761..f9b986c1 100644
> --- a/pbs-datastore/src/datastore.rs
> +++ b/pbs-datastore/src/datastore.rs
> @@ -185,7 +185,7 @@ impl DataStore {
>              )?;
>              Arc::new(ChunkStore::open(
>                  name,
> -                &config.path,
> +                config.absolute_path(),
>                  tuning.sync_level.unwrap_or_default(),
>              )?)
>          };
> @@ -265,8 +265,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,
> @@ -1405,7 +1408,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 9f1112a9..73af92cc 100644
> --- a/src/api2/node/disks/directory.rs
> +++ b/src/api2/node/disks/directory.rs
> @@ -251,12 +251,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 f79ec2f5..c9d70ee8 100644
> --- a/src/bin/proxmox-backup-proxy.rs
> +++ b/src/bin/proxmox-backup-proxy.rs
> @@ -1142,8 +1142,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));

^ Note that with this series now, the `gather_disk_stats` call is
spamming 2 log messages per removable datastore regularly when they're
not available.

    ... proxmox-backup-proxy[166412]: read fs info on "/mnt/datastore/remo/pbs/remo" failed - ENOENT: No such file or directory
    ... proxmox-backup-proxy[166412]: find_mounted_device failed - ENOENT: No such file or directory

and so on

These should be suppressed for removable datastores (at least on ENOENT)