From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 09CE71FF15C for ; Wed, 4 Sep 2024 16:11:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 98BD31D833; Wed, 4 Sep 2024 16:12:09 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Wed, 4 Sep 2024 16:11:37 +0200 Message-Id: <20240904141155.350454-9-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240904141155.350454-1-h.laimer@proxmox.com> References: <20240904141155.350454-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.018 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup v12 08/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" Signed-off-by: Hannes Laimer --- src/api2/config/datastore.rs | 37 ++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index ca6edf05..c24b6e9d 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -4,7 +4,7 @@ use ::serde::{Deserialize, Serialize}; use anyhow::Error; use hex::FromHex; use serde_json::Value; -use tracing::warn; +use tracing::{info, warn}; use proxmox_router::{http_bail, Permission, Router, RpcEnvironment, RpcEnvironmentType}; use proxmox_schema::{api, param_bail, ApiType}; @@ -20,7 +20,8 @@ use pbs_config::BackupLockGuard; use pbs_datastore::chunk_store::ChunkStore; use crate::api2::admin::{ - prune::list_prune_jobs, sync::list_sync_jobs, verify::list_verification_jobs, + datastore::do_mount_device, prune::list_prune_jobs, sync::list_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; @@ -71,13 +72,30 @@ pub(crate) fn do_create_datastore( mut config: SectionConfigData, datastore: DataStoreConfig, ) -> Result<(), Error> { - let path: PathBuf = datastore.path.clone().into(); + let path: PathBuf = datastore.absolute_path().into(); + let backup_user = pbs_config::backup_user()?; + if let Some(store_mount_point) = datastore.get_mount_point() { + let default_options = proxmox_sys::fs::CreateOptions::new(); + proxmox_sys::fs::create_path( + store_mount_point, + Some(default_options.clone()), + Some(default_options.clone()), + )?; + do_mount_device(datastore.clone())?; + + if path.join(".chunks").is_dir() { + config.set_data(&datastore.name, "datastore", &datastore)?; + pbs_config::datastore::save_config(&config)?; + jobstate::create_state_file("garbage_collection", &datastore.name)?; + info!("created removable datastore, chunkstore already exists"); + return Ok(()); + } + } let tuning: DatastoreTuning = serde_json::from_value( DatastoreTuning::API_SCHEMA .parse_property_string(datastore.tuning.as_deref().unwrap_or(""))?, )?; - let backup_user = pbs_config::backup_user()?; let _store = ChunkStore::create( &datastore.name, path, @@ -120,6 +138,17 @@ pub fn create_datastore( param_bail!("name", "datastore '{}' already exists.", config.name); } + if let Some(uuid) = &config.backing_device { + for (datastore_name, (_, config)) in §ion_config.sections { + if config["backing-device"].as_str() == Some(uuid) { + param_bail!( + "backing-device", + "device already in use by datastore '{datastore_name}'", + ); + } + } + } + let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI; -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel