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 D4E801FF173 for ; Mon, 25 Nov 2024 17:22:23 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 852EC185B1; Mon, 25 Nov 2024 17:22:22 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Mon, 25 Nov 2024 17:21:53 +0100 Message-Id: <20241125162213.157011-7-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241125162213.157011-1-h.laimer@proxmox.com> References: <20241125162213.157011-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 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 Subject: [pbs-devel] [PATCH proxmox-backup v15 06/26] api: removable datastore creation 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" Devices can contains multiple datastores. If the specified path already contains a datastore, `reuse datastore` has to be set so it'll be added without creating a chunckstore. Signed-off-by: Hannes Laimer --- src/api2/config/datastore.rs | 62 ++++++++++++++++++++++++++++-------- 1 file changed, 48 insertions(+), 14 deletions(-) diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index 37d1528c7..d4cee458d 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -1,7 +1,7 @@ use std::path::PathBuf; use ::serde::{Deserialize, Serialize}; -use anyhow::{bail, Error}; +use anyhow::{bail, format_err, Error}; use hex::FromHex; use serde_json::Value; use tracing::warn; @@ -21,7 +21,8 @@ use pbs_config::BackupLockGuard; use pbs_datastore::chunk_store::ChunkStore; use crate::api2::admin::{ - prune::list_prune_jobs, sync::list_config_sync_jobs, verify::list_verification_jobs, + datastore::do_mount_device, prune::list_prune_jobs, sync::list_config_sync_jobs, + verify::list_verification_jobs, }; use crate::api2::config::prune::{delete_prune_job, do_create_prune_job}; use crate::api2::config::sync::delete_sync_job; @@ -32,6 +33,7 @@ use pbs_config::CachedUserInfo; use proxmox_rest_server::WorkerTask; use crate::server::jobstate; +use crate::tools::disks::unmount_by_mountpoint; #[api( input: { @@ -73,37 +75,58 @@ pub(crate) fn do_create_datastore( datastore: DataStoreConfig, reuse_datastore: bool, ) -> Result<(), Error> { - let path: PathBuf = datastore.path.clone().into(); + let path: PathBuf = datastore.absolute_path().into(); if path.parent().is_none() { bail!("cannot create datastore in root path"); } + let need_unmount = datastore.backing_device.is_some(); + if need_unmount { + do_mount_device(datastore.clone())?; + }; + let tuning: DatastoreTuning = serde_json::from_value( DatastoreTuning::API_SCHEMA .parse_property_string(datastore.tuning.as_deref().unwrap_or(""))?, )?; - if reuse_datastore { - ChunkStore::verify_chunkstore(&path)?; + let res = if reuse_datastore { + ChunkStore::verify_chunkstore(&path) } else { + let mut is_empty = true; if let Ok(dir) = std::fs::read_dir(&path) { for file in dir { let name = file?.file_name(); let name = name.to_str(); if !name.map_or(false, |name| name.starts_with('.') || name == "lost+found") { - bail!("datastore path is not empty"); + is_empty = false; + break; } } } - let backup_user = pbs_config::backup_user()?; - let _store = ChunkStore::create( - &datastore.name, - path, - backup_user.uid, - backup_user.gid, - tuning.sync_level.unwrap_or_default(), - )?; + if is_empty { + let backup_user = pbs_config::backup_user()?; + ChunkStore::create( + &datastore.name, + path.clone(), + backup_user.uid, + backup_user.gid, + tuning.sync_level.unwrap_or_default(), + ) + .map(|_| ()) + } else { + Err(format_err!("datastore path not empty")) + } + }; + + if res.is_err() { + if need_unmount { + if let Err(e) = unmount_by_mountpoint(&path) { + warn!("could not unmount device: {e}"); + } + } + return res; } config.set_data(&datastore.name, "datastore", &datastore)?; @@ -147,6 +170,17 @@ pub fn create_datastore( param_bail!("name", "datastore '{}' already exists.", config.name); } + if config.backing_device.is_none() && !config.path.starts_with("/") { + param_bail!("path", "expected an abolute path, '{}' is not", config.path); + } + if config.backing_device.is_some() && config.path.starts_with("/") { + param_bail!( + "path", + "expected a relative on-device path, '{}' is not", + config.path + ); + } + let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI; -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel