From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id E966A1FF17E for ; Thu, 13 Nov 2025 15:22:05 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2B4241E3D7; Thu, 13 Nov 2025 15:23:00 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 13 Nov 2025 15:22:13 +0100 Message-ID: <20251113142214.719217-7-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251113142214.719217-1-c.ebner@proxmox.com> References: <20251113142214.719217-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763043720467 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.048 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: [pbs-devel] [PATCH proxmox-backup v3 6/7] api: config: avoid unneeded backend instance on s3 store recreation 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" The backend type is already known from the config and can be used to check if the s3-refresh should be performed, there is no need to actually instantiate the backend at this point. Signed-off-by: Christian Ebner --- changes since version 1: - not present in previous version src/api2/config/datastore.rs | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index 677adf3d5..0bbf2002f 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -32,9 +32,7 @@ use crate::api2::config::tape_backup_job::{delete_tape_backup_job, list_tape_bac use crate::api2::config::verify::delete_verification_job; use pbs_config::CachedUserInfo; -use pbs_datastore::{ - get_datastore_mount_status, DataStore, DatastoreBackend, S3_DATASTORE_IN_USE_MARKER, -}; +use pbs_datastore::{get_datastore_mount_status, DataStore, S3_DATASTORE_IN_USE_MARKER}; use proxmox_rest_server::WorkerTask; use proxmox_s3_client::{S3ObjectKey, S3_HTTP_REQUEST_TIMEOUT}; @@ -338,9 +336,8 @@ pub fn create_datastore( let store_name = config.name.to_string(); - if let (_backend, Some(s3_client)) = - DataStore::s3_client_and_backend_from_datastore_config(&config)? - { + let (backend, s3_client) = DataStore::s3_client_and_backend_from_datastore_config(&config)?; + if let Some(s3_client) = s3_client { proxmox_async::runtime::block_on(s3_client.head_bucket()) .context("failed to access bucket") .map_err(|err| format_err!("{err:#}"))?; @@ -370,15 +367,9 @@ pub fn create_datastore( Some(Operation::Lookup), ) .context("failed to lookup datastore")?; - match datastore - .backend() - .context("failed to get datastore backend")? - { - DatastoreBackend::Filesystem => (), - DatastoreBackend::S3(_s3_client) => { - proxmox_async::runtime::block_on(datastore.s3_refresh()) - .context("S3 refresh failed")?; - } + if backend == DatastoreBackendType::S3 { + proxmox_async::runtime::block_on(datastore.s3_refresh()) + .context("S3 refresh failed")?; } } Ok(()) -- 2.47.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel