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

Queue addition of housekeeper tasks

Browse Source 
This fixes the hang on startup when binlogrouter calls hktask_add.
This commit is contained in:
Markus Mäkelä
2019-03-25 12:34:13 +02:00
parent 1e4c5f5d2f
commit f0756cd708
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
server/core/mainworker.cc
View File

@ -61,20 +61,20 @@ MainWorker& MainWorker::get()
void MainWorker::add_task(const char* zName, TASKFN func, void* pData, int frequency) void MainWorker::add_task(const char* zName, TASKFN func, void* pData, int frequency)
{ {
call([=]() { execute([=]() {
mxb_assert(m_tasks_by_name.find(zName) == m_tasks_by_name.end()); mxb_assert(m_tasks_by_name.find(zName) == m_tasks_by_name.end());
Task task(zName, func, pData, frequency); Task task(zName, func, pData, frequency);
auto p = m_tasks_by_name.insert(std::make_pair(std::string(zName), task)); auto p = m_tasks_by_name.insert(std::make_pair(std::string(zName), task));
Task& inserted_task = (*p.first).second; Task& inserted_task = (*p.first).second;
inserted_task.id = delayed_call(frequency * 1000, inserted_task.id = delayed_call(frequency * 1000,
&MainWorker::call_task, &MainWorker::call_task,
this, this,
&inserted_task); &inserted_task);
}, },
EXECUTE_AUTO); EXECUTE_AUTO);
} }
void MainWorker::remove_task(const char* zName) void MainWorker::remove_task(const char* zName)