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

Close connections before starting loop

Browse Source 
The connections should be closed after the check queries.
This commit is contained in:
Esa Korhonen
2018-07-02 19:10:43 +03:00
parent 7ded2c436f
commit 34f61bc4f2
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
server/modules/monitor/mariadbmon/mariadbmon.cc
View File

@ -360,10 +360,15 @@ void MariaDBMonitor::pre_loop()
// MonitorInstance read the journal and has the last known master in its m_master member variable. // MonitorInstance read the journal and has the last known master in its m_master member variable.
// Write the corresponding MariaDBServer into the class-specific m_master variable. // Write the corresponding MariaDBServer into the class-specific m_master variable.
m_master = MonitorInstance::m_master ? get_server_info(MonitorInstance::m_master) : NULL; m_master = MonitorInstance::m_master ? get_server_info(MonitorInstance::m_master) : NULL;
m_log_no_master = true;
/* It's possible (e.g. after switchover) that the MXS_MONITORED_SERVER-objects have live connections if (m_detect_replication_lag)
* from last time the monitor was active. These should be closed to avoid confusing the monitor and {
* making it clear this is a new start. This can be removed once monitor pause/resume is implemented. */ check_maxscale_schema_replication();
}
/* This loop can be removed if/once the replication check code is inside tick. It's required so that
* the monitor makes new connections when starting. */
for (MariaDBServer* server : m_servers) for (MariaDBServer* server : m_servers)
{ {
if (server->m_server_base->con) if (server->m_server_base->con)
@ -372,13 +377,6 @@ void MariaDBMonitor::pre_loop()
server->m_server_base->con = NULL; server->m_server_base->con = NULL;
} }
} }
if (m_detect_replication_lag)
{
check_maxscale_schema_replication();
}
m_log_no_master = true;
} }
void MariaDBMonitor::tick() void MariaDBMonitor::tick()