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

Fix to MXS-447: https://mariadb.atlassian.net/browse/MXS-447

Browse Source 
Monitors are now started after they have been fully configured.
This commit is contained in:
Markus Makela
2015-11-04 11:50:21 +02:00
parent b6783c24d0
commit cd6f7ce046
4 changed files with 68 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
server/core/config.c
View File

@ -343,6 +343,12 @@ int rval, ini_rval;
rval = process_config_context(config.next);
free_config_context(config.next);
/** Start all monitors */
if(rval)
{
monitorStartAll();
}
return rval;
}
@ -1156,7 +1162,7 @@ process_config_context(CONFIG_CONTEXT *context)
gateway.id = getpid();
}
monitorStart(obj->element,obj->parameters);
monitorAddParameters(obj->element, obj->parameters);
/* set monitor interval */
if (interval > 0)
@ -1253,6 +1259,7 @@ process_config_context(CONFIG_CONTEXT *context)
obj = obj->next;
} /*< while */
/** TODO: consistency check function */
hashtable_free(monitorhash);
@ -1460,6 +1467,22 @@ return_p2:
return p2;
}
/**
* Free a configuration parameter
* @param p1 Parameter to free
*/
void free_config_parameter(CONFIG_PARAMETER* p1)
{
while (p1)
{
free(p1->name);
free(p1->value);
CONFIG_PARAMETER* p2 = p1->next;
free(p1);
p1 = p2;
}
}
/**
* Free a config tree
*
@ -1474,15 +1497,7 @@ CONFIG_PARAMETER *p1, *p2;
while (context)
{
free(context->object);
p1 = context->parameters;
while (p1)
{
free(p1->name);
free(p1->value);
p2 = p1->next;
free(p1);
p1 = p2;
}
free_config_parameter(context->parameters);
obj = context->next;
free(context);
context = obj;

37
server/core/monitor.c
View File

@ -118,6 +118,7 @@ MONITOR *ptr;
ptr->next = mon->next;
}
spinlock_release(&monLock);
free_config_parameter(mon->parameters);
free(mon->name);
free(mon);
}
@ -137,6 +138,23 @@ monitorStart(MONITOR *monitor, void* params)
spinlock_release(&monitor->lock);
}
/**
* Start all monitors
*/
void monitorStartAll()
{
MONITOR *ptr;
spinlock_acquire(&monLock);
ptr = allMonitors;
while (ptr)
{
monitorStart(ptr, ptr->parameters);
ptr = ptr->next;
}
spinlock_release(&monLock);
}
/**
* Stop a given monitor
*
@ -522,3 +540,22 @@ bool check_monitor_permissions(MONITOR* monitor)
free(dpasswd);
return rval;
}
/**
* Add parameters to the monitor
* @param monitor Monitor
* @param params Config parameters
*/
void monitorAddParameters(MONITOR *monitor, CONFIG_PARAMETER *params)
{
while (params)
{
CONFIG_PARAMETER* clone = config_clone_param(params);
if (clone)
{
clone->next = monitor->parameters;
monitor->parameters = clone;
}
params = params->next;
}
}