Proxmox/proxmox-backup
5
0
Fork 0
mirror of git://git.proxmox.com/git/proxmox-backup.git synced 2025-01-05 09:17:59 +03:00
Code Releases Activity

config: factor out method to get the absolute datastore path

Browse Source 
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@proxmox.com>
This commit is contained in:
Dietmar Maurer 2024-11-13 16:00:38 +01:00 committed by Thomas Lamprecht
parent 9ab2e4e710
commit 01bbaef7fa
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pbs-api-types/src/datastore.rs
View File

@ -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(

11
pbs-datastore/src/datastore.rs
View File

@ -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 {

4
src/api2/node/disks/directory.rs
View File

@ -249,12 +249,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
);
}

8
src/server/metric_collection/mod.rs
View File

@ -175,8 +175,12 @@ fn collect_disk_stats_sync() -> (DiskStat, Vec<DiskStat>) {
{
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) => {