From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pbs-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id 77A4B1FF385
for <inbox@lore.proxmox.com>; Wed, 24 Apr 2024 15:26:30 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 80FCACF96;
Wed, 24 Apr 2024 15:26:36 +0200 (CEST)
Date: Wed, 24 Apr 2024 15:26:32 +0200
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Hannes Laimer <h.laimer@proxmox.com>
Message-ID: <2btfuleutfjoaqnoyn627pm6cq33p2wu2effpiecau4eau3kax@uq5qwokacold>
References: <20240423083000.28002-1-h.laimer@proxmox.com>
<20240423083000.28002-3-h.laimer@proxmox.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <20240423083000.28002-3-h.laimer@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.086 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [proxmox-backup-proxy.rs, directory.rs, datastore.rs]
Subject: Re: [pbs-devel] [PATCH proxmox-backup v9 02/26] config: factor out
method to get the absolute datastore path
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.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