From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id BE6EE1FF15C for ; Wed, 13 Nov 2024 16:01:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 67E311867D; Wed, 13 Nov 2024 16:01:11 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Wed, 13 Nov 2024 16:00:38 +0100 Message-Id: <20241113150102.164820-3-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241113150102.164820-1-h.laimer@proxmox.com> References: <20241113150102.164820-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.020 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup v13 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" From: Dietmar Maurer 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 --- changes since v12: * just commit msg pbs-api-types/src/datastore.rs | 5 +++++ pbs-datastore/src/datastore.rs | 11 +++++++---- src/api2/node/disks/directory.rs | 4 ++-- src/server/metric_collection/mod.rs | 8 ++++++-- 4 files changed, 20 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 { 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 06ad5ba1..7f540220 100644 --- a/src/api2/node/disks/directory.rs +++ b/src/api2/node/disks/directory.rs @@ -249,12 +249,12 @@ pub fn delete_datastore_disk(name: String) -> Result<(), Error> { let (config, _) = pbs_config::datastore::config()?; let datastores: Vec = config.convert_to_typed_array("datastore")?; let conflicting_datastore: Option = - 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/server/metric_collection/mod.rs b/src/server/metric_collection/mod.rs index 3cbd7425..b95dba20 100644 --- a/src/server/metric_collection/mod.rs +++ b/src/server/metric_collection/mod.rs @@ -175,8 +175,12 @@ fn collect_disk_stats_sync() -> (DiskStat, Vec) { { continue; } - let path = Path::new(&config.path); - datastores.push(gather_disk_stats(disk_manager.clone(), path, &config.name)); + + datastores.push(gather_disk_stats( + disk_manager.clone(), + Path::new(&config.absolute_path()), + &config.name, + )); } } Err(err) => { -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel