(doris) branch master updated: [Fix](recycler) Fix protobuf out-of-bounds problem in recycler (#46484)

[gavinchou]

This is an automated email from the ASF dual-hosted git repository.

gavinchou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 3da66157b78 [Fix](recycler) Fix protobuf out-of-bounds problem in 
recycler (#46484)
3da66157b78 is described below

commit 3da66157b780df6e12f902ab754d37ee99850f7b
Author: abmdocrt <lianyuk...@selectdb.com>
AuthorDate: Wed Jan 8 01:31:37 2025 +0800

    [Fix](recycler) Fix protobuf out-of-bounds problem in recycler (#46484)
---
 cloud/src/meta-service/meta_service_job.cpp | 8 ++++++++
 cloud/src/recycler/recycler.cpp             | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/cloud/src/meta-service/meta_service_job.cpp 
b/cloud/src/meta-service/meta_service_job.cpp
index cc80d5bd138..b7b5e86953d 100644
--- a/cloud/src/meta-service/meta_service_job.cpp
+++ b/cloud/src/meta-service/meta_service_job.cpp
@@ -876,6 +876,14 @@ 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("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);
 
     if (num_rowsets < 1) {
diff --git a/cloud/src/recycler/recycler.cpp b/cloud/src/recycler/recycler.cpp
index 04476704bd3..ba67711866b 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;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org