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 B854A1FF17C for ; Wed, 3 Sep 2025 16:49:19 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 780B510FEE; Wed, 3 Sep 2025 16:49:34 +0200 (CEST) From: Lukas Wagner To: pdm-devel@lists.proxmox.com Date: Wed, 3 Sep 2025 16:48:51 +0200 Message-ID: <20250903144852.370452-2-l.wagner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250903144852.370452-1-l.wagner@proxmox.com> References: <20250903144852.370452-1-l.wagner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1756910925237 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 Subject: [pdm-devel] [PATCH proxmox-datacenter-manager 1/2] server: remote task archive: handle missing journal file gracefully X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" This file is only created after the first update round. This fixes a 'could not create task archive iterator' error when requesting the task list directly after server startup, in case the journal was deleted or has not existed before. Signed-off-by: Lukas Wagner --- server/src/remote_tasks/task_cache.rs | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/server/src/remote_tasks/task_cache.rs b/server/src/remote_tasks/task_cache.rs index e9e708e4..57047c8c 100644 --- a/server/src/remote_tasks/task_cache.rs +++ b/server/src/remote_tasks/task_cache.rs @@ -952,14 +952,27 @@ impl<'a> TaskArchiveIterator<'a> { .peekable(); if let Some(journal) = journal { - let journal_reader = Box::new(BufReader::new(File::open(journal)?)); - let journal_task_iterator = JournalIterator::new(journal_reader).peekable(); - let merge_task_iter = MergeTaskIterator::new(journal_task_iterator, inner); + let file = File::open(journal); - Ok(Self { - inner: Box::new(merge_task_iter), - _lock: lock, - }) + match file { + Ok(file) => { + let journal_reader = Box::new(BufReader::new(file)); + let journal_task_iterator = JournalIterator::new(journal_reader).peekable(); + let merge_task_iter = MergeTaskIterator::new(journal_task_iterator, inner); + + Ok(Self { + inner: Box::new(merge_task_iter), + _lock: lock, + }) + } + Err(err) if err.kind() == ErrorKind::NotFound => Ok(Self { + inner: Box::new(inner), + _lock: lock, + }), + Err(err) => { + return Err(err.into()); + } + } } else { Ok(Self { inner: Box::new(inner), -- 2.47.2 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel