[pbs-devel] [PATCH proxmox-backup] api: datastore: add missing log context for prune

[pbs-devel] [PATCH proxmox-backup] api: datastore: add missing log context for prune

[Christian Ebner]

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

Re: [pbs-devel] [PATCH proxmox-backup] api: datastore: add missing log context for prune

[Gabriel Goller]

On 27.01.2025 14:38, Christian Ebner wrote:
>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.

I had a feeling the "task-less" prune job would come back to haunt us,
and sure enough, here we are :(.

Fix looks good though, let's hope we can remove this in the next release
anyway.

Consider:
Reviewed-by: Gabriel Goller <g.goller@proxmox.com


_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel

[pbs-devel] applied: [PATCH proxmox-backup] api: datastore: add missing log context for prune

[Thomas Lamprecht]

Am 27.01.25 um 14:38 schrieb Christian Ebner:
> 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(-)
> 
>

applied, with Gabriel's R-b, thanks!


_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel