From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Hannes Laimer <h.laimer@proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Subject: Re: [pbs-devel] [PATCH proxmox-backup v9 02/26] config: factor out method to get the absolute datastore path
Date: Wed, 24 Apr 2024 15:26:32 +0200 [thread overview]
Message-ID: <2btfuleutfjoaqnoyn627pm6cq33p2wu2effpiecau4eau3kax@uq5qwokacold> (raw)
In-Reply-To: <20240423083000.28002-3-h.laimer@proxmox.com>
On Tue, Apr 23, 2024 at 10:29:36AM +0200, Hannes Laimer wrote:
> From: Dietmar Maurer <dietmar@proxmox.com>
>
> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> Signed-off-by: Dietmar Maurer <dietmar@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)
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next prev parent reply other threads:[~2024-04-24 13:26 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-23 8:29 [pbs-devel] [PATCH proxmox-backup v9 00/26] add removable datastores Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 01/26] tools: add disks utility functions Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 02/26] config: factor out method to get the absolute datastore path Hannes Laimer
2024-04-24 13:26 ` Wolfgang Bumiller [this message]
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 03/26] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 04/26] maintenance: add 'Unmount' maintenance type Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 05/26] disks: add UUID to partition info Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 06/26] datastore: add helper for checking if a removable datastore is available Hannes Laimer
2024-04-24 11:16 ` Gabriel Goller
2024-04-24 13:30 ` Wolfgang Bumiller
2024-04-25 6:05 ` Hannes Laimer
2024-04-25 7:19 ` Wolfgang Bumiller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 07/26] api: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 08/26] api: removable datastore creation Hannes Laimer
2024-04-24 13:04 ` Wolfgang Bumiller
2024-04-25 8:52 ` Wolfgang Bumiller
2024-04-25 8:58 ` Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 09/26] api: disks list: add exclude-used flag Hannes Laimer
2024-04-24 13:09 ` Wolfgang Bumiller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 10/26] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2024-04-24 13:13 ` Wolfgang Bumiller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 11/26] bin: manager: add (un)mount command Hannes Laimer
2024-04-24 11:25 ` Gabriel Goller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 12/26] add auto-mounting for removable datastores Hannes Laimer
2024-04-24 13:18 ` Wolfgang Bumiller
2024-04-25 5:32 ` Hannes Laimer
2024-04-25 5:34 ` Hannes Laimer
2024-04-24 13:35 ` Wolfgang Bumiller
2024-04-25 4:59 ` Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 13/26] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 14/26] docs: add removable datastores section Hannes Laimer
2024-04-24 11:53 ` Gabriel Goller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 15/26] ui: add partition selector form Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 16/26] ui: add removable datastore creation support Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 17/26] ui: add (un)mount button to summary Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 18/26] ui: tree: render unmounted datastores correctly Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 19/26] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 20/26] ui: add datastore status mask for unmounted removable datastores Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 21/26] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 22/26] ui: render 'unmount' maintenance mode correctly Hannes Laimer
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 23/26] api: node: allow creation of removable datastore through directory endpoint Hannes Laimer
2024-04-24 11:56 ` Gabriel Goller
2024-04-24 13:21 ` Wolfgang Bumiller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 24/26] api: node: include removable datastores in directory list Hannes Laimer
2024-04-24 13:06 ` Wolfgang Bumiller
2024-04-23 8:29 ` [pbs-devel] [PATCH proxmox-backup v9 25/26] node: disks: replace BASE_MOUNT_DIR with DATASTORE_MOUNT_DIR Hannes Laimer
2024-04-23 8:30 ` [pbs-devel] [PATCH proxmox-backup v9 26/26] ui: support create removable datastore through directory creation Hannes Laimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2btfuleutfjoaqnoyn627pm6cq33p2wu2effpiecau4eau3kax@uq5qwokacold \
--to=w.bumiller@proxmox.com \
--cc=h.laimer@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox