From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <h.laimer@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id F3F3196EE9
for <pbs-devel@lists.proxmox.com>; Tue, 16 Apr 2024 16:27:35 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id CDEC91D0E1
for <pbs-devel@lists.proxmox.com>; Tue, 16 Apr 2024 16:27:05 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pbs-devel@lists.proxmox.com>; Tue, 16 Apr 2024 16:27:05 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id F41D7451FF
for <pbs-devel@lists.proxmox.com>; Tue, 16 Apr 2024 16:27:04 +0200 (CEST)
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Tue, 16 Apr 2024 16:27:04 +0200
Message-Id: <D0LM8AWI64TJ.3S1SWCDUFTLTL@proxmox.com>
From: "Hannes Laimer" <h.laimer@proxmox.com>
To: "Christian Ebner" <c.ebner@proxmox.com>, "Proxmox Backup Server
development discussion" <pbs-devel@lists.proxmox.com>
X-Mailer: aerc 0.17.0-78-g4ffbaa6b3946
References: <20240409110012.166472-1-h.laimer@proxmox.com>
<20240409110012.166472-8-h.laimer@proxmox.com>
<b2ce3a2b-3fc2-4a22-b3d0-c57c30a093cb@proxmox.com>
In-Reply-To: <b2ce3a2b-3fc2-4a22-b3d0-c57c30a093cb@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL -0.008 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: Re: [pbs-devel] [PATCH proxmox-backup v3 07/24] api2: 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
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 16 Apr 2024 14:27:36 -0000
On Mon Apr 15, 2024 at 6:02 PM CEST, Christian Ebner wrote:
> 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(-)
> >=20
> > diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.r=
s
> > 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, R=
pcEnvironmentType};
> > 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;
> > =20
> > use pbs_api_types::{
> > @@ -20,7 +20,8 @@ use pbs_config::BackupLockGuard;
> > use pbs_datastore::chunk_store::ChunkStore;
> > =20
> > use crate::api2::admin::{
> > - prune::list_prune_jobs, sync::list_sync_jobs, verify::list_verific=
ation_jobs,
> > + datastore::do_mount_device, prune::list_prune_jobs, sync::list_syn=
c_jobs,
> > + verify::list_verification_jobs,
> > };
> > use crate::api2::config::prune::{delete_prune_job, do_create_prune_jo=
b};
> > 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 =3D PathBuf::from(&datastore.path=
);
>
> There is no need for the additional type annotation, the type is already=
=20
> given by the return type of the `PathBuf::from()`.
>
> > +
> > + let default_options =3D 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(), worke=
r)?;
> > +
> > + 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) =3D worker {
> > + task_log!(
> > + worker,
> > + "created removable datastore, chunkstore already e=
xists"
> > + );
> > + return Ok(());
> > + }
> > + }
>
> If `.chunks` already exists on the mounted datastore, but it is not a=20
> directory, then I guess something is off. Can and should this be handled=
=20
> early, or is this already fully covered by the `ChunkStore::create` call=
=20
> later on?
>
ChunkStore::create will fail in that case
> > + }
> > +
> > let path: PathBuf =3D datastore.path.clone().into();
> > =20
> > let tuning: DatastoreTuning =3D serde_json::from_value(
> > @@ -122,6 +148,28 @@ pub fn create_datastore(
> > param_bail!("name", "datastore '{}' already exists.", config.=
name);
> > }
> > =20
> > + if let Some(uuid) =3D &config.backing_device {
> > + let already_used_by =3D 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 =3D=3D uuid)
> > + .map(|_| datastore_name)
> > + })
> > + .next();
> > +
> > + if let Some(datastore_name) =3D already_used_by {
> > + param_bail!(
> > + "backing-device",
> > + "device already in use by datastore '{datastore_name}'=
",
> > + );
> > + }
> > + }
> > +
> > let auth_id: Authid =3D rpcenv.get_auth_id().unwrap().parse()?;
> > let to_stdout =3D rpcenv.env_type() =3D=3D RpcEnvironmentType::CL=
I;
> > =20