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 BCA301FF17F for <inbox@lore.proxmox.com>; Mon, 19 May 2025 07:55:49 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DBA913FFB1; Mon, 19 May 2025 07:56:14 +0200 (CEST) From: Christian Ebner <c.ebner@proxmox.com> To: pbs-devel@lists.proxmox.com Date: Mon, 19 May 2025 07:55:17 +0200 Message-Id: <20250519055518.3747-4-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250519055518.3747-1-c.ebner@proxmox.com> References: <20250519055518.3747-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.222 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 KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years 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.rs] Subject: [pbs-devel] [PATCH v2 proxmox-backup 3/4] garbage collection: bypass cache if gc-cache-capacity is 0 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-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> Since commit 1e7639bf ("fixup minimum lru capacity") the LRU cache capacity is set to a minimum value of 1 to avoid issues with the edge case of 0 capacity. In commit f1a711c8 ("garbage collection: set phase1 LRU cache capacity by tuning option") this was not taken into account, allowing to set values in the range [0, 8*1024*1024] via the datastores tuning parameters. Bypass the cache by making it optional and do not use it if the cache capacity is set to 0, which implies it being disabled. Signed-off-by: Christian Ebner <c.ebner@proxmox.com> --- changes since version 1: - not present in previous version pbs-datastore/src/datastore.rs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index cbf78ecb6..dbff84bf3 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -1072,7 +1072,7 @@ impl DataStore { &self, index: Box<dyn IndexFile>, file_name: &Path, // only used for error reporting - chunk_lru_cache: &mut LruCache<[u8; 32], ()>, + chunk_lru_cache: &mut Option<LruCache<[u8; 32], ()>>, status: &mut GarbageCollectionStatus, worker: &dyn WorkerTaskContext, ) -> Result<(), Error> { @@ -1085,8 +1085,10 @@ impl DataStore { let digest = index.index_digest(pos).unwrap(); // Avoid multiple expensive atime updates by utimensat - if chunk_lru_cache.insert(*digest, ()) { - continue; + if let Some(chunk_lru_cache) = chunk_lru_cache { + if chunk_lru_cache.insert(*digest, ()) { + continue; + } } if !self.inner.chunk_store.cond_touch_chunk(digest, false)? { @@ -1130,7 +1132,11 @@ impl DataStore { let mut unprocessed_index_list = self.list_index_files()?; let mut index_count = unprocessed_index_list.len(); - let mut chunk_lru_cache = LruCache::new(cache_capacity); + let mut chunk_lru_cache = if cache_capacity > 0 { + Some(LruCache::new(cache_capacity)) + } else { + None + }; let mut processed_index_files = 0; let mut last_percentage: usize = 0; -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel