From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate001.proxmox.com (gate001.proxmox.com [45.144.208.40]) by lore.proxmox.com (Postfix) with ESMTPS id 258581FF0AF for ; Fri, 20 Nov 2026 09:27:32 +0100 (CET) Received: from gate001.proxmox.com (localhost.localdomain [127.0.0.1]) by gate001.proxmox.com (Proxmox) with ESMTP id 33E2E216BF; Fri, 20 Nov 2026 09:27:31 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Subject: [PATCH proxmox v2 3/3] rest-server: clamp old task log cleanup cutoff to earliest active task Date: Fri, 20 Nov 2026 09:27:10 +0100 Message-ID: <20261120082710.65728-4-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261120082710.65728-1-c.ebner@proxmox.com> References: <20261120082710.65728-1-c.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1795163247177 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.357 Adjusted score from AWL reputation of From: address DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment (newer systems) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Message-ID-Hash: YUVLKJ6QT6UOTXXTWVAS7VSKKI6NHSVR X-Message-ID-Hash: YUVLKJ6QT6UOTXXTWVAS7VSKKI6NHSVR X-MailFrom: c.ebner@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Determining the cutoff timestamp for old task log cleanup previously only inspected the oldest entry in the task archive, which only tracks finished tasks. Still running tasks are listed exclusively in the active tasks file without an end time. If a long-running task started before the calculated archive cutoff time and has not written any new log lines since then, its log file's mtime is older than the cutoff time and cleanup_old_tasks() would remove the log file while the task is still active. Prevent this by also reading the active task list while holding the shared task list lock during cutoff time gathering and clamping the cutoff timestamp to the earliest active task's start time. Since a task's log file is created after its UPID start time is generated, its mtime is guaranteed to be at or after that timestamp. Signed-off-by: Christian Ebner --- proxmox-rest-server/src/worker_task.rs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/proxmox-rest-server/src/worker_task.rs b/proxmox-rest-server/src/worker_task.rs index 80889451..04803556 100644 --- a/proxmox-rest-server/src/worker_task.rs +++ b/proxmox-rest-server/src/worker_task.rs @@ -264,7 +264,8 @@ impl WorkerTaskSetup { } /// Identify the oldest finished task entry's timestamp by iterating the task - /// archive and return the calculated cutoff time. + /// archive, clamped to the earliest active task's start time, and return the + /// calculated cutoff time. /// /// Note: acquired a shared lock on [`WorkerTaskSetup::task_lock_fn`]. fn oldest_task_cutoff_time(&self, compressed: bool,) -> Result, Error> { @@ -273,11 +274,20 @@ impl WorkerTaskSetup { let logrotate = LogRotate::new(&self.task_archive_fn, compressed, None, None)?; if let Some(last_file) = logrotate.files().last() { + let oldest_active = read_task_file_from_path(&self.active_tasks_fn)? + .into_iter() + .map(|info| info.upid.starttime) + .min(); + let reader = BufReader::new(last_file); for line in reader.lines() { let line = line?; if let Ok((_, _, Some(state))) = parse_worker_status_line(&line) { - let timestamp = state.endtime(); + let mut timestamp = state.endtime(); + + if let Some(oldest_active) = oldest_active { + timestamp = timestamp.min(oldest_active); + } let cutoff_time = if timestamp > 0 { SystemTime::UNIX_EPOCH.checked_add(Duration::from_secs(timestamp as u64)) @@ -385,7 +395,7 @@ pub fn rotate_task_log_archive( } /// removes all task logs that are older than the oldest task entry in the -/// task archive +/// task archive and not currently active pub fn cleanup_old_tasks(compressed: bool) -> Result<(), Error> { let setup = worker_task_setup()?; -- 2.47.3