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

MXS-2474 Ignore attempts to re-register a housekeeper task

Browse Source 
It is an error to register the same task multiple times, but
for a maintenance release it is simpler and less risky to simply
ignore an attempt (that BLR does) to do that.

Allowing a task to be registered anew causes behaviour akin
to a leak.
This commit is contained in:
Johan Wikman 2019-05-07 16:04:34 +03:00
parent 5ea2bab88c
commit b313c6d0e7
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
server/core/housekeeper.cc
View File

@ -12,6 +12,7 @@
*/
#include <maxscale/ccdefs.hh>
#include <algorithm>
#include <cstdlib>
#include <list>
#include <string.h>
@ -205,7 +206,29 @@ void Housekeeper::stop()
void Housekeeper::add(const Task& task)
{
std::lock_guard<std::mutex> guard(m_lock);
m_tasks.push_back(task);
auto i = std::find_if(m_tasks.begin(), m_tasks.end(), Task::NameMatch(task.name));
if (i == m_tasks.end())
{
m_tasks.push_back(task);
}
else
{
const Task& existing = *i;
bool identical = false;
if (task.func == existing.func
&& task.data == existing.data
&& task.frequency == existing.frequency)
{
identical = true;
}
MXS_INFO("Housekeeper task `%s` added anew, all settings %s identical. "
"Second attempt to add is ignored.",
identical ? "ARE" : "are NOT",
task.name.c_str());
}
}
void Housekeeper::remove(std::string name)