From 2418afe34751ff04d1be53bda998a4caaa7af86e Mon Sep 17 00:00:00 2001 From: discord9 Date: Sat, 28 Feb 2026 16:52:23 +0800 Subject: [PATCH] after rebase Signed-off-by: discord9 --- src/datanode/src/heartbeat/handler/gc_worker.rs | 11 +++++++---- src/meta-srv/src/gc/scheduler.rs | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/datanode/src/heartbeat/handler/gc_worker.rs b/src/datanode/src/heartbeat/handler/gc_worker.rs index f005793d98..b974c28dcc 100644 --- a/src/datanode/src/heartbeat/handler/gc_worker.rs +++ b/src/datanode/src/heartbeat/handler/gc_worker.rs @@ -102,10 +102,13 @@ impl InstructionHandler for GcRegionsHandler { reports.push(report); } - // Merge reports - let mut merged_report = GcReport::default(); - for report in reports { - merged_report.merge(report); + // Merge reports + let mut merged_report = GcReport::default(); + for report in reports { + merged_report.merge(report); + } + + Ok(merged_report) } .instrument(common_telemetry::tracing::info_span!("gc_worker_run")), ), diff --git a/src/meta-srv/src/gc/scheduler.rs b/src/meta-srv/src/gc/scheduler.rs index dedaab6747..0a04b16439 100644 --- a/src/meta-srv/src/gc/scheduler.rs +++ b/src/meta-srv/src/gc/scheduler.rs @@ -189,6 +189,7 @@ impl GcScheduler { common_telemetry::tracing::info_span!("meta_gc_tick", trigger = "manual"); match self .handle_manual_gc(region_ids, full_file_listing, timeout) + .instrument(span) .await { Ok(report) => {