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

MXS-1775 Load server journal unconditionally

Browse Source 
The server journal is unconditionally loaded and need not be
done in @c pre_loop.
This commit is contained in:
Johan Wikman
2018-06-06 10:23:08 +03:00
parent f600b3a769
commit af717426d5
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -283,8 +283,9 @@ void MariaDBMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server
void MariaDBMonitor::pre_loop()
{
MonitorInstance::pre_loop();
// MonitorInstance loaded from the journal the current master into its
// m_master member variable, we want the corresponding MariaDBServer into
// our own m_master varaible.
m_master = MonitorInstance::m_master ? get_server_info(MonitorInstance::m_master) : NULL;
if (m_detect_replication_lag)
@ -414,6 +415,12 @@ void MariaDBMonitor::tick()
/* log master detection failure of first master becomes available after failure */
log_master_changes(root_master);
// Before exiting we need to store the current master into the m_master
// member variable of MonitorInstance so tga loaded from the journal the current master into its
// m_master member variable, we want the corresponding MariaDBServer into
// our own m_master varaible.
MonitorInstance::m_master = m_master ? m_master->m_server_base : NULL;
}
void MariaDBMonitor::process_state_changes()