Skip to content
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

Jump to bottom

[bugfix](wgcore) map at only get reference and it will core in multithread #31702

Merged
merged 2 commits into from
Mar 3, 2024
Merged

[bugfix](wgcore) map at only get reference and it will core in multithread #31702

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2638412
[bugfix](wgcore) map at only get reference and it will core in multit…
Doris-Extras Mar 3, 2024
0becdae
f
Doris-Extras Mar 3, 2024
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
18 changes: 10 additions & 8 deletions be/src/runtime/task_group/task_group_manager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,33 +72,35 @@ TaskGroupPtr TaskGroupManager::get_task_group_by_id(uint64_t tg_id) {
void TaskGroupManager::delete_task_group_by_ids(std::set<uint64_t> used_wg_id) {
int64_t begin_time = MonotonicMillis();
// 1 get delete group without running queries
std::set<uint64_t> deleted_tg_ids;
std::vector<TaskGroupPtr> deleted_task_groups;
{
std::lock_guard<std::shared_mutex> write_lock(_group_mutex);
for (auto iter = _task_groups.begin(); iter != _task_groups.end(); iter++) {
uint64_t tg_id = iter->first;
auto* task_group_ptr = iter->second.get();
auto task_group_ptr = iter->second;
if (used_wg_id.find(tg_id) == used_wg_id.end()) {
task_group_ptr->shutdown();
// only when no query running in task group, its resource can be released in BE
if (task_group_ptr->query_num() == 0) {
LOG(INFO) << "There is no query in wg " << tg_id << ", delete it.";
deleted_tg_ids.insert(tg_id);
deleted_task_groups.push_back(task_group_ptr);
}
}
}
}

// 2 stop active thread
for (uint64_t tg_id : deleted_tg_ids) {
_task_groups.at(tg_id)->try_stop_schedulers();
for (auto& tg : deleted_task_groups) {
// There is not lock here, but the tg may be released by another
// thread, so that we should use shared ptr here, not use tg_id
tg->try_stop_schedulers();
}

// 3 release resource in memory
{
std::lock_guard<std::shared_mutex> write_lock(_group_mutex);
for (uint64_t tg_id : deleted_tg_ids) {
_task_groups.erase(tg_id);
for (auto& tg : deleted_task_groups) {
_task_groups.erase(tg->id());
}
}

Expand Down Expand Up @@ -129,7 +131,7 @@ void TaskGroupManager::delete_task_group_by_ids(std::set<uint64_t> used_wg_id) {
}
int64_t time_cost_ms = MonotonicMillis() - begin_time;
LOG(INFO) << "finish clear unused task group, time cost: " << time_cost_ms
<< "ms, deleted group size:" << deleted_tg_ids.size();
<< "ms, deleted group size:" << deleted_task_groups.size();
}

void TaskGroupManager::stop() {
Expand Down
Loading