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 4FF271FF191 for ; Tue, 4 Nov 2025 14:07:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1C92BCF78; Tue, 4 Nov 2025 14:08:22 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 4 Nov 2025 14:06:54 +0100 Message-ID: <20251104130659.435139-15-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251104130659.435139-1-c.ebner@proxmox.com> References: <20251104130659.435139-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1762261622268 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 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 v2 14/19] datastore: get per-chunk file lock for chunk rename on s3 backend 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" To guarantee exclusive access during s3 object store and cache operations, acquire the per-chunk file before renaming a chunk when the datastore is backed by s3. This does not yet cover locking for the GC and chunk insert, part of subsequent changes. Signed-off-by: Christian Ebner --- Changes since version 1: - define timout const, inline timeout calls pbs-datastore/src/datastore.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 0aff95cdd..81630e7f9 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -56,6 +56,8 @@ pub const GROUP_OWNER_FILE_NAME: &str = "owner"; /// Filename for in-use marker stored on S3 object store backend pub const S3_DATASTORE_IN_USE_MARKER: &str = ".in-use"; const NAMESPACE_MARKER_FILENAME: &str = ".namespace"; +// s3 put request times out after upload_size / 1 Kib/s, so about 2.3 hours for 8 MiB +const CHUNK_LOCK_TIMEOUT: Duration = Duration::from_secs(3 * 60 * 60); /// checks if auth_id is owner, or, if owner is a token, if /// auth_id is the user of the token @@ -2600,6 +2602,13 @@ impl DataStore { pub fn rename_corrupt_chunk(&self, digest: &[u8; 32]) -> Result, Error> { let (path, digest_str) = self.chunk_path(digest); + let _chunk_guard; + if let DatastoreBackendType::S3 = self.inner.backend_config.ty.unwrap_or_default() { + _chunk_guard = self + .inner + .chunk_store + .lock_chunk(digest, CHUNK_LOCK_TIMEOUT)?; + } let _lock = self.inner.chunk_store.mutex().lock().unwrap(); let mut counter = 0; -- 2.47.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel