Skip to content

[fix](clean trash) Fix clean trash lost submit task #35271

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
dataroaring merged 1 commit into from
May 23, 2024
Merged

[fix](clean trash) Fix clean trash lost submit task #35271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion be/src/agent/agent_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ void AgentServer::start_workers(ExecEnv* exec_env) {
_report_tablet_workers = std::make_unique<ReportWorker>(
"REPORT_OLAP_TABLE", _master_info, config::report_tablet_interval_seconds,[&engine, &master_info = _master_info] { report_tablet_callback(engine, master_info); });

_clean_trash_binlog_workers = std::make_unique<TaskWorkerPool>(
_clean_trash_workers = std::make_unique<TaskWorkerPool>(
"CLEAN_TRASH", 1, [&engine](auto&& task) {return clean_trash_callback(engine, task); });
// clang-format on
}
Expand Down Expand Up @@ -270,6 +270,14 @@ void AgentServer::submit_tasks(TAgentResult& agent_result,
"task(signature={}) has wrong request member = gc_binlog_req", signature);
}
break;
case TTaskType::CLEAN_TRASH:
if (task.__isset.clean_trash_req) {
_clean_trash_workers->submit_task(task);
} else {
ret_st = Status::InvalidArgument(
"task(signature={}) has wrong request member = clean_trash_req", signature);
}
break;
default:
ret_st = Status::InvalidArgument("task(signature={}, type={}) has wrong task type",
signature, task_type);
Expand Down
2 changes: 1 addition & 1 deletion be/src/agent/agent_server.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class AgentServer {
std::unique_ptr<TaskWorkerPool> _push_storage_policy_workers;
std::unique_ptr<TopicSubscriber> _topic_subscriber;
std::unique_ptr<TaskWorkerPool> _gc_binlog_workers;
std::unique_ptr<TaskWorkerPool> _clean_trash_binlog_workers;
std::unique_ptr<TaskWorkerPool> _clean_trash_workers;
};

} // end namespace doris