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 57B791FF173 for <inbox@lore.proxmox.com>; Mon, 27 Jan 2025 14:38:54 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 433672B61F; Mon, 27 Jan 2025 14:38:52 +0100 (CET) From: Christian Ebner <c.ebner@proxmox.com> To: pbs-devel@lists.proxmox.com Date: Mon, 27 Jan 2025 14:38:26 +0100 Message-Id: <20250127133826.356618-1-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.036 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup] api: datastore: add missing log context for prune 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> Adds the missing log context for cases were a prune is not executed as dedicated tokio task. Commit 432de66a ("api: make prune-group a real workertask") moved the prune group logic into it's own tokio task conditionally. However, the log context was missing for cases where no dedicated task/thread is started, leading to the worker task state being unknown after finish, as no logs are written to the worker task log file. Reported in the community forum: https://forum.proxmox.com/threads/161273/ Signed-off-by: Christian Ebner <c.ebner@proxmox.com> --- src/api2/admin/datastore.rs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/api2/admin/datastore.rs b/src/api2/admin/datastore.rs index f5d80d610..dbb7ae477 100644 --- a/src/api2/admin/datastore.rs +++ b/src/api2/admin/datastore.rs @@ -19,6 +19,7 @@ use tracing::{info, warn}; use proxmox_async::blocking::WrappedReaderStream; use proxmox_async::{io::AsyncChannelWriter, stream::AsyncReaderStream}; use proxmox_compression::zstd::ZstdEncoder; +use proxmox_log::LogContext; use proxmox_router::{ http_err, list_subdirs_api_method, ApiHandler, ApiMethod, ApiResponseFuture, Permission, Router, RpcEnvironment, RpcEnvironmentType, SubdirMap, @@ -1112,9 +1113,13 @@ pub fn prune( )?; Ok(json!(upid)) } else { - let (worker, _) = WorkerTask::new("prune", Some(worker_id), auth_id.to_string(), true)?; - let result = prune_group(worker.clone()); - worker.log_result(&Ok(())); + let (worker, logger) = + WorkerTask::new("prune", Some(worker_id), auth_id.to_string(), true)?; + let result = LogContext::new(logger).sync_scope(|| { + let result = prune_group(worker.clone()); + worker.log_result(&Ok(())); + result + }); Ok(json!(result)) } } -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel