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

MXS-22: Shutting down monitor now closes database connections

Browse Source 
Shutting down monitors is not supposed to be done ofter so there is no true
benefit from keeping the connections open. With the refactoring of the monitor
interface, this can be done in a centralized place.
This commit is contained in:
Markus Makela
2016-02-04 11:48:01 +02:00
parent 9e33f300b0
commit 4f2a87f732
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/monitor.c
View File

@ -186,13 +186,23 @@ void monitorStartAll()
void void
monitorStop(MONITOR *monitor) monitorStop(MONITOR *monitor)
{ {
spinlock_acquire(&monitor->lock);
if (monitor->state != MONITOR_STATE_STOPPED) if (monitor->state != MONITOR_STATE_STOPPED)
{ {
monitor->state = MONITOR_STATE_STOPPING; monitor->state = MONITOR_STATE_STOPPING;
monitor->module->stopMonitor(monitor); monitor->module->stopMonitor(monitor);
monitor->state = MONITOR_STATE_STOPPED; monitor->state = MONITOR_STATE_STOPPED;
MONITOR_SERVERS* db = monitor->databases;
while (db)
{
mysql_close(db->con);
db->con = NULL;
db = db->next;
} }
} }
spinlock_release(&monitor->lock);
}
/** /**
* Shutdown all running monitors * Shutdown all running monitors