Skip to content

Fix data race in MariaModule groups_ vector access #210

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

Draft
Copilot wants to merge 3 commits into
base: eloq-10.6.10
Choose a base branch
from
Draft

Fix data race in MariaModule groups_ vector access #210

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
c2a62b7
Initial plan
Copilot Jan 16, 2026
5b85a1e
Fix concurrent issue in MariaModule by adding mutex synchronization
Copilot Jan 16, 2026
0545d76
Add bounds checking to SetGroup method
Copilot Jan 16, 2026
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
45 changes: 35 additions & 10 deletions sql/threadpool_generic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2539,22 +2539,38 @@ bool thread_group_t::HasActiveWorker() const
#ifdef ELOQ_MODULE_ENABLED
void MariaModule::ExtThdStart(int thd_id)
{
if (thd_id < 0 || (size_t) thd_id >= groups_.size())
thread_group_t *group = nullptr;
{
std::lock_guard<std::mutex> lk(groups_mutex_);
if (thd_id >= 0 && (size_t)thd_id < groups_.size()) {
group = groups_[thd_id];
}
}

if (group == nullptr)
{
return;
}

SetIsSqlThd(false);
groups_[thd_id]->ext_worker_active_.store(true, std::memory_order_relaxed);
group->ext_worker_active_.store(true, std::memory_order_relaxed);
}

void MariaModule::ExtThdEnd(int thd_id)
{
if (thd_id < 0 || (size_t) thd_id >= groups_.size())
thread_group_t *group = nullptr;
{
std::lock_guard<std::mutex> lk(groups_mutex_);
if (thd_id >= 0 && (size_t)thd_id < groups_.size()) {
group = groups_[thd_id];
}
}

if (group == nullptr)
{
return;
}
thread_group_t *group = groups_[thd_id];

group->ext_worker_active_.store(false, std::memory_order_relaxed);

mysql_mutex_lock(&group->mutex);
Expand All @@ -2575,13 +2591,15 @@ void MariaModule::ExtThdEnd(int thd_id)

void MariaModule::Process(int thd_id)
{
if (thd_id < 0 || (size_t) thd_id >= groups_.size())
thread_group_t *group = nullptr;
{
return;
std::lock_guard<std::mutex> lk(groups_mutex_);
if (thd_id >= 0 && (size_t)thd_id < groups_.size()) {
group = groups_[thd_id];
}
}

thread_group_t *group = groups_[thd_id];
if (group->shutdown.load(std::memory_order_relaxed))
if (group == nullptr || group->shutdown.load(std::memory_order_relaxed))
{
return;
}
Expand Down Expand Up @@ -2673,12 +2691,19 @@ void MariaModule::Process(int thd_id)

bool MariaModule::HasTask(int thd_id) const
{
if (thd_id < 0 || (size_t) thd_id >= groups_.size())
thread_group_t *group = nullptr;
{
std::lock_guard<std::mutex> lk(groups_mutex_);
if (thd_id >= 0 && (size_t)thd_id < groups_.size()) {
group = groups_[thd_id];
}
}

if (group == nullptr)
{
return false;
}

thread_group_t *group= groups_[thd_id];
CoroutineInfo *coro_info= group->coroutine_info_.get();
return !coro_info->req_queue_.IsEmpty() ||
!coro_info->resume_queue_.IsEmpty() ||
Expand Down
15 changes: 13 additions & 2 deletions sql/threadpool_generic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,11 +251,22 @@ class MariaModule : public eloq::EloqModule
void Process(int thd_id) override;
bool HasTask(int thd_id) const override;

void ResizeGroups(size_t size) { groups_.resize(size, nullptr); }
void SetGroup(size_t gid, thread_group_t *group) { groups_[gid]= group; }
void ResizeGroups(size_t size)
{
std::lock_guard<std::mutex> lk(groups_mutex_);
groups_.resize(size, nullptr);
}
void SetGroup(size_t gid, thread_group_t *group)
{
std::lock_guard<std::mutex> lk(groups_mutex_);
if (gid < groups_.size()) {
groups_[gid] = group;
}
}

private:
std::vector<thread_group_t *> groups_;
mutable std::mutex groups_mutex_;
};
#endif

Expand Down