From: Christian Ebner <c.ebner@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>,
Hannes Laimer <h.laimer@proxmox.com>
Subject: Re: [pbs-devel] [PATCH proxmox-backup v3 07/24] api2: removable datastore creation
Date: Mon, 15 Apr 2024 18:02:51 +0200 [thread overview]
Message-ID: <b2ce3a2b-3fc2-4a22-b3d0-c57c30a093cb@proxmox.com> (raw)
In-Reply-To: <20240409110012.166472-8-h.laimer@proxmox.com>
On 4/9/24 12:59, Hannes Laimer wrote:
> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> ---
> src/api2/config/datastore.rs | 52 ++++++++++++++++++++++++++++++++++--
> 1 file changed, 50 insertions(+), 2 deletions(-)
>
> diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
> index 3081e1f4..0194d7d4 100644
> --- a/src/api2/config/datastore.rs
> +++ b/src/api2/config/datastore.rs
> @@ -8,7 +8,7 @@ use serde_json::Value;
> use proxmox_router::{http_bail, Permission, Router, RpcEnvironment, RpcEnvironmentType};
> use proxmox_schema::{api, param_bail, ApiType};
> use proxmox_section_config::SectionConfigData;
> -use proxmox_sys::{task_warn, WorkerTaskContext};
> +use proxmox_sys::{task_log, task_warn, WorkerTaskContext};
> use proxmox_uuid::Uuid;
>
> use pbs_api_types::{
> @@ -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;
> @@ -72,6 +73,31 @@ pub(crate) fn do_create_datastore(
> datastore: DataStoreConfig,
> worker: Option<&dyn WorkerTaskContext>,
> ) -> Result<(), Error> {
> + if datastore.backing_device.is_some() {
> + let mut mount_point: PathBuf = PathBuf::from(&datastore.path);
There is no need for the additional type annotation, the type is already
given by the return type of the `PathBuf::from()`.
> +
> + let default_options = proxmox_sys::fs::CreateOptions::new();
> + proxmox_sys::fs::create_path(
> + &mount_point,
> + Some(default_options.clone()),
> + Some(default_options),
> + )?;
> + do_mount_device(None, config.clone(), datastore.clone(), worker)?;
> +
> + mount_point.push(".chunks");
> + if mount_point.is_dir() {
> + config.set_data(&datastore.name, "datastore", &datastore)?;
> + pbs_config::datastore::save_config(&config)?;
> + if let Some(worker) = worker {
> + task_log!(
> + worker,
> + "created removable datastore, chunkstore already exists"
> + );
> + return Ok(());
> + }
> + }
If `.chunks` already exists on the mounted datastore, but it is not a
directory, then I guess something is off. Can and should this be handled
early, or is this already fully covered by the `ChunkStore::create` call
later on?
> + }
> +
> let path: PathBuf = datastore.path.clone().into();
>
> let tuning: DatastoreTuning = serde_json::from_value(
> @@ -122,6 +148,28 @@ pub fn create_datastore(
> param_bail!("name", "datastore '{}' already exists.", config.name);
> }
>
> + if let Some(uuid) = &config.backing_device {
> + let already_used_by = section_config
> + .sections
> + .iter()
> + .flat_map(|(datastore_name, (_, config))| {
> + config
> + .as_object()
> + .and_then(|cfg| cfg.get("backing-device"))
> + .and_then(|backing_device| backing_device.as_str())
> + .filter(|&device_uuid| device_uuid == uuid)
> + .map(|_| datastore_name)
> + })
> + .next();
> +
> + if let Some(datastore_name) = already_used_by {
> + 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;
>
next prev parent reply other threads:[~2024-04-15 16:03 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-09 10:59 [pbs-devel] [PATCH proxmox-backup v3 00/24] add removable datastores Hannes Laimer
2024-04-09 10:59 ` [pbs-devel] [PATCH proxmox-backup v3 01/24] tools: add disks utility functions Hannes Laimer
2024-04-09 10:59 ` [pbs-devel] [PATCH proxmox-backup v3 02/24] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2024-04-10 8:13 ` Dietmar Maurer
2024-04-11 10:04 ` Dietmar Maurer
2024-04-15 15:17 ` Christian Ebner
2024-04-09 10:59 ` [pbs-devel] [PATCH proxmox-backup v3 03/24] maintenance: add 'Unpplugged' maintenance type Hannes Laimer
2024-04-11 7:19 ` Dietmar Maurer
2024-04-11 8:16 ` Hannes Laimer
2024-04-09 10:59 ` [pbs-devel] [PATCH proxmox-backup v3 04/24] disks: add UUID to partition info Hannes Laimer
2024-04-09 10:59 ` [pbs-devel] [PATCH proxmox-backup v3 05/24] add helper for checking if a removable datastore is available Hannes Laimer
2024-04-10 8:40 ` Dietmar Maurer
2024-04-15 15:09 ` Christian Ebner
2024-04-16 14:17 ` Hannes Laimer
2024-04-09 10:59 ` [pbs-devel] [PATCH proxmox-backup v3 06/24] api2: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-04-10 9:02 ` Dietmar Maurer
2024-04-10 9:08 ` Hannes Laimer
2024-04-10 10:41 ` Dietmar Maurer
2024-04-10 9:12 ` Dietmar Maurer
2024-04-15 15:50 ` Christian Ebner
2024-04-16 14:25 ` Hannes Laimer
2024-04-09 10:59 ` [pbs-devel] [PATCH proxmox-backup v3 07/24] api2: removable datastore creation Hannes Laimer
2024-04-10 9:33 ` Dietmar Maurer
2024-04-15 16:02 ` Christian Ebner [this message]
2024-04-16 14:27 ` Hannes Laimer
2024-04-09 10:59 ` [pbs-devel] [PATCH proxmox-backup v3 08/24] api2: disks list: add only-unused flag Hannes Laimer
2024-04-15 16:27 ` Christian Ebner
2024-04-09 10:59 ` [pbs-devel] [PATCH proxmox-backup v3 09/24] pbs-api-types: datastore: use new proxmox_scheme::de for deserialization Hannes Laimer
2024-04-09 10:59 ` [pbs-devel] [PATCH proxmox-backup v3 10/24] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2024-04-16 7:37 ` Christian Ebner
2024-04-09 10:59 ` [pbs-devel] [PATCH proxmox-backup v3 11/24] pb-manager: add (un)mount command Hannes Laimer
2024-04-10 10:08 ` Dietmar Maurer
2024-04-16 7:50 ` Christian Ebner
2024-04-09 11:00 ` [pbs-devel] [PATCH proxmox-backup v3 12/24] add auto-mounting for removable datastores Hannes Laimer
2024-04-16 8:05 ` Christian Ebner
2024-04-16 14:39 ` Hannes Laimer
2024-04-16 8:45 ` Christian Ebner
2024-04-09 11:00 ` [pbs-devel] [PATCH proxmox-backup v3 13/24] api: mark removable datastores as unplugged after restart Hannes Laimer
2024-04-10 11:18 ` Dietmar Maurer
2024-04-09 11:00 ` [pbs-devel] [PATCH proxmox-backup v3 14/24] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-04-16 8:10 ` Christian Ebner
2024-04-09 11:00 ` [pbs-devel] [PATCH proxmox-backup v3 15/24] docs: mention maintenance mode reset when removable datastore is unplugged Hannes Laimer
2024-04-09 11:00 ` [pbs-devel] [PATCH proxmox-backup v3 16/24] ui: add partition selector form Hannes Laimer
2024-04-16 8:57 ` Christian Ebner
2024-04-09 11:00 ` [pbs-devel] [PATCH proxmox-backup v3 17/24] ui: add removable datastore creation support Hannes Laimer
2024-04-09 11:00 ` [pbs-devel] [PATCH proxmox-backup v3 18/24] ui: add (un)mount button to summary Hannes Laimer
2024-04-09 11:00 ` [pbs-devel] [PATCH proxmox-backup v3 19/24] ui: display removable datastores in list Hannes Laimer
2024-04-09 11:00 ` [pbs-devel] [PATCH proxmox-backup v3 20/24] ui: utils: render unplugged maintenance mode correctly Hannes Laimer
2024-04-09 11:00 ` [pbs-devel] [PATCH proxmox-backup v3 21/24] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2024-04-09 11:00 ` [pbs-devel] [PATCH proxmox-backup v3 22/24] ui: add datastore status mask for unplugged removable datastores Hannes Laimer
2024-04-09 11:00 ` [pbs-devel] [PATCH proxmox-backup v3 23/24] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2024-04-09 11:00 ` [pbs-devel] [PATCH proxmox-backup v3 24/24] ui: maintenance: disable edit if unplugged Hannes Laimer
2024-04-16 9:37 ` [pbs-devel] [PATCH proxmox-backup v3 00/24] add removable datastores Christian Ebner
2024-04-16 15:03 ` Hannes Laimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b2ce3a2b-3fc2-4a22-b3d0-c57c30a093cb@proxmox.com \
--to=c.ebner@proxmox.com \
--cc=h.laimer@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox