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 4B4701FF15C for ; Wed, 11 Dec 2024 11:41:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E85DB7698; Wed, 11 Dec 2024 11:41:33 +0100 (CET) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Wed, 11 Dec 2024 11:40:47 +0100 Message-Id: <20241211104050.69441-5-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241211104050.69441-1-h.laimer@proxmox.com> References: <20241211104050.69441-1-h.laimer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [datastore.name, datastore.rs] Subject: [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 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" 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 --- 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 5e0e99f0b..7b318975d 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 { 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