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

Set monitor state before thread launch

Browse Source 
When the monitor is started, the state is immediately updated
to running, and not only when the thread actually has started
executing.
This commit is contained in:
Johan Wikman
2017-09-29 13:06:49 +03:00
parent 4aea1b6150
commit f87a878073
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/modules/monitor/mysqlmon/mysql_mon.cc
View File

@ -305,13 +305,18 @@ startMonitor(MXS_MONITOR *monitor, const MXS_CONFIG_PARAMETER* params)
MXS_FREE(handle);
handle = NULL;
}
else if (thread_start(&handle->thread, monitorMain, handle, 0) == NULL)
else
{
MXS_ERROR("Failed to start monitor thread for monitor '%s'.", monitor->name);
hashtable_free(handle->server_info);
MXS_FREE(handle->script);
MXS_FREE(handle);
handle = NULL;
handle->status = MXS_MONITOR_RUNNING;
if (thread_start(&handle->thread, monitorMain, handle, 0) == NULL)
{
MXS_ERROR("Failed to start monitor thread for monitor '%s'.", monitor->name);
hashtable_free(handle->server_info);
MXS_FREE(handle->script);
MXS_FREE(handle);
handle = NULL;
}
}
return handle;
@ -1171,10 +1176,10 @@ monitorMain(void *arg)
if (mysql_thread_init())
{
MXS_ERROR("mysql_thread_init failed in monitor module. Exiting.");
handle->status = MXS_MONITOR_STOPPED;
return;
}
handle->status = MXS_MONITOR_RUNNING;
load_server_journal(mon, &handle->master);
while (1)