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 [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 2C3AA1FF168
for <inbox@lore.proxmox.com>; Tue, 4 Feb 2025 15:35:23 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id ECF6A192A7;
Tue, 4 Feb 2025 15:35:22 +0100 (CET)
Message-ID: <618be27b-49fe-4bd5-b980-211ef7d93efc@proxmox.com>
Date: Tue, 4 Feb 2025 15:34:49 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>, Hannes Laimer <h.laimer@proxmox.com>
References: <20250116064543.74619-1-h.laimer@proxmox.com>
<20250116064543.74619-5-h.laimer@proxmox.com>
Content-Language: en-US, de-DE
From: Christian Ebner <c.ebner@proxmox.com>
In-Reply-To: <20250116064543.74619-5-h.laimer@proxmox.com>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.031 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 4/7] api: admin: trigger sync
jobs only on datastore mount
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>
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>
This patch should rather be placed as preparatory patch before patch 3
and changes to `do_sync_jobs` directly included in the previous patch.
On 1/16/25 07:45, Hannes Laimer wrote:
> Ensure sync jobs are triggered only when the datastore is actually
> mounted. If the datastore is already mounted, we don't fail,
> but sync jobs should not be re-triggered unnecessarily. This change
> prevents redundant sync job execution.
>
> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> ---
> src/api2/admin/datastore.rs | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs
> index 21b58391d..e29ff9b99 100644
> --- a/src/api2/admin/datastore.rs
> +++ b/src/api2/admin/datastore.rs
> @@ -2445,14 +2445,14 @@ fn setup_mounted_device(datastore: &DataStoreConfig, tmp_mount_path: &str) -> Re
> /// The reason for the randomized device mounting paths is to avoid two tasks trying to mount to
> /// the same path, this is *very* unlikely since the device is only mounted really shortly, but
> /// technically possible.
> -pub fn do_mount_device(datastore: DataStoreConfig) -> Result<(), Error> {
> +pub fn do_mount_device(datastore: DataStoreConfig) -> Result<bool, Error> {
> if let Some(uuid) = datastore.backing_device.as_ref() {
> if pbs_datastore::get_datastore_mount_status(&datastore) == Some(true) {
> info!(
> "device is already mounted at '{}'",
> datastore.absolute_path()
> );
> - return Ok(());
> + return Ok(false);
> }
> let tmp_mount_path = format!(
> "{}/{:x}",
> @@ -2497,7 +2497,7 @@ pub fn do_mount_device(datastore: DataStoreConfig) -> Result<(), Error> {
> datastore.name
> )
> }
> - Ok(())
> + Ok(true)
> }
>
> async fn do_sync_jobs(
> @@ -2582,7 +2582,9 @@ pub fn mount(store: String, rpcenv: &mut dyn RpcEnvironment) -> Result<Value, Er
> auth_id.to_string(),
> to_stdout,
> move |_worker| async move {
> - do_mount_device(datastore.clone())?;
> + if !do_mount_device(datastore.clone())? {
> + return Ok(());
> + }
> let Ok((sync_config, _digest)) = pbs_config::sync::config() else {
> warn!("unable to read sync job config, won't run any sync jobs");
> return Ok(());
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel