hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix race in housekeeper

Browse Source 
Could and indeed did lead to housekeeper exiting immediately.
This commit is contained in:
Johan Wikman
2018-10-04 18:01:26 +03:00
parent e56492c23f
commit ef948042f0
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/core/housekeeper.cc
View File

@ -278,6 +278,8 @@ void hktask_remove(const char* name)
void hkthread(hkstart_result* res) void hkthread(hkstart_result* res)
{ {
// res is on the stack in Housekeeper::start() and remains valid only
// until sem_post() is called.
res->ok = qc_thread_init(QC_INIT_BOTH); res->ok = qc_thread_init(QC_INIT_BOTH);
if (!res->ok) if (!res->ok)
@ -285,9 +287,11 @@ void hkthread(hkstart_result* res)
MXS_ERROR("Could not initialize query classifier in housekeeper thread."); MXS_ERROR("Could not initialize query classifier in housekeeper thread.");
} }
bool ok = res->ok;
sem_post(&res->sem); sem_post(&res->sem);
// NOTE: res is no longer valid here.
if (res->ok) if (ok)
{ {
MXS_NOTICE("Housekeeper thread started."); MXS_NOTICE("Housekeeper thread started.");
hk->run(); hk->run();