From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pbs-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id CAD1220EC88
for <inbox@lore.proxmox.com>; Thu, 25 Apr 2024 10:53:09 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 0E3301D8ED;
Thu, 25 Apr 2024 10:53:17 +0200 (CEST)
Date: Thu, 25 Apr 2024 10:52:40 +0200
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Hannes Laimer <h.laimer@proxmox.com>
Message-ID: <b7ev4k6r74fn2g6vkfp446tzhcyuenlzudrrfx3zapuldlt5eq@auzyejxr3qfl>
References: <20240423083000.28002-1-h.laimer@proxmox.com>
<20240423083000.28002-9-h.laimer@proxmox.com>
<qnmmh5pqowwuub4anvs4wtji7gt3kxhx47iyorgyfkveu2hodf@bbfvccy6hvnz>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <qnmmh5pqowwuub4anvs4wtji7gt3kxhx47iyorgyfkveu2hodf@bbfvccy6hvnz>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.086 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 v9 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
<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>
Reply-To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>
On Wed, Apr 24, 2024 at 03:04:19PM +0200, Wolfgang Bumiller wrote:
> On Tue, Apr 23, 2024 at 10:29:42AM +0200, Hannes Laimer wrote:
> > Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> > ---
> > src/api2/config/datastore.rs | 63 +++++++++++++++++++++++++++++++++---
> > 1 file changed, 59 insertions(+), 4 deletions(-)
> >
> > diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs
> > index 87425ff5..ac1248b3 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,13 +73,45 @@ pub(crate) fn do_create_datastore(
> > datastore: DataStoreConfig,
> > worker: Option<&dyn WorkerTaskContext>,
> > ) -> Result<(), Error> {
> > - let path: PathBuf = datastore.path.clone().into();
> > + let mut 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(), worker)?;
> > +
> > + let dir_opts = proxmox_sys::fs::CreateOptions::new()
> > + .owner(backup_user.uid)
> > + .group(backup_user.gid);
> > + proxmox_sys::fs::create_path(
> > + datastore.absolute_path(),
> > + Some(default_options),
> > + Some(dir_opts),
> > + )?;
>
> ^ The create_path call can be dropped, since ChunkStore::create already
> does this.
This was probably an artefact of my testing. The call in ChunkStore
create uses root:root for the directory above the `.chunks/` dir, so we
do need this, but maybe we should instead do it inside the
ChunkStore::create method.
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel