From 928cc9853413c03eed3aa7890e78d1ea4814b951 Mon Sep 17 00:00:00 2001 From: Yukang-Lian Date: Mon, 6 Jan 2025 21:39:24 +0800 Subject: [PATCH 1/3] 1 --- cloud/src/recycler/recycler.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cloud/src/recycler/recycler.cpp b/cloud/src/recycler/recycler.cpp index 04476704bd36c7..ba67711866bb0a 100644 --- a/cloud/src/recycler/recycler.cpp +++ b/cloud/src/recycler/recycler.cpp @@ -2893,9 +2893,9 @@ int InstanceRecycler::recycle_expired_stage_objects() { int ret = 0; for (const auto& stage : instance_info_.stages()) { std::stringstream ss; - ss << "instance_id=" << instance_id_ << ", stage_id=" << stage.stage_id() - << ", user_name=" << stage.mysql_user_name().at(0) - << ", user_id=" << stage.mysql_user_id().at(0) + ss << "instance_id=" << instance_id_ << ", stage_id=" << stage.stage_id() << ", user_name=" + << (stage.mysql_user_name().empty() ? "null" : stage.mysql_user_name().at(0)) + << ", user_id=" << (stage.mysql_user_id().empty() ? "null" : stage.mysql_user_id().at(0)) << ", prefix=" << stage.obj_info().prefix(); if (stopped()) break; From 7cf2dda30a4320331f189401bcd35b51fbcba4c2 Mon Sep 17 00:00:00 2001 From: Yukang-Lian Date: Tue, 7 Jan 2025 15:46:00 +0800 Subject: [PATCH 2/3] 2 --- cloud/src/meta-service/meta_service_job.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cloud/src/meta-service/meta_service_job.cpp b/cloud/src/meta-service/meta_service_job.cpp index cc80d5bd138980..e0f7c8ceb22c8c 100644 --- a/cloud/src/meta-service/meta_service_job.cpp +++ b/cloud/src/meta-service/meta_service_job.cpp @@ -876,6 +876,10 @@ void process_compaction_job(MetaServiceCode& code, std::string& msg, std::string txn->remove(rs_start, rs_end); + LOG_INFO("cloud process compaction job txn remove meta rowset key") + .tag("rs_start", rs_start) + .tag("rs_end", rs_end); + TEST_SYNC_POINT_CALLBACK("process_compaction_job::loop_input_done", &num_rowsets); if (num_rowsets < 1) { From 228088bcf4140eb69487917d238e446dbac8a323 Mon Sep 17 00:00:00 2001 From: Yukang-Lian Date: Tue, 7 Jan 2025 15:53:54 +0800 Subject: [PATCH 3/3] 3 --- cloud/src/meta-service/meta_service_job.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cloud/src/meta-service/meta_service_job.cpp b/cloud/src/meta-service/meta_service_job.cpp index e0f7c8ceb22c8c..b7b5e86953d589 100644 --- a/cloud/src/meta-service/meta_service_job.cpp +++ b/cloud/src/meta-service/meta_service_job.cpp @@ -877,8 +877,12 @@ void process_compaction_job(MetaServiceCode& code, std::string& msg, std::string txn->remove(rs_start, rs_end); LOG_INFO("cloud process compaction job txn remove meta rowset key") - .tag("rs_start", rs_start) - .tag("rs_end", rs_end); + .tag("instance_id", instance_id) + .tag("tablet_id", tablet_id) + .tag("start_version", start) + .tag("end_version", end + 1) + .tag("rs_start key", hex(rs_start)) + .tag("rs_end key", hex(rs_end)); TEST_SYNC_POINT_CALLBACK("process_compaction_job::loop_input_done", &num_rowsets);