Skip to content

[Fix](recycler) Fix protobuf out-of-bounds problem in recycler #46484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gavinchou merged 3 commits into from
Jan 7, 2025
Merged

[Fix](recycler) Fix protobuf out-of-bounds problem in recycler #46484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
928cc98
1
Yukang-Lian Jan 6, 2025
7cf2dda
2
Yukang-Lian Jan 7, 2025
228088b
3
Yukang-Lian Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions cloud/src/meta-service/meta_service_job.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions cloud/src/recycler/recycler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading