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

Move items from MonitorWorker to MonitorWorkerSimple

Browse Source 
MonitorWorker only enforces the use of a worker thread but otherwise
does not define how the monitor is implemented.
This commit is contained in:
Esa Korhonen
2019-04-11 15:20:05 +03:00
parent 2bc0b9c875
commit 75c0ac5323
4 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/modules/monitor/clustrixmon/clustrixmonitor.cc
View File

@ -248,6 +248,7 @@ void ClustrixMonitor::server_removed(SERVER* pServer)
void ClustrixMonitor::pre_loop()
{
load_server_journal(nullptr);
if (m_config.dynamic_node_detection())
{
// At startup we accept softfailed nodes in an attempt to be able to
@ -275,6 +276,7 @@ void ClustrixMonitor::post_loop()
void ClustrixMonitor::tick()
{
check_maintenance_requests();
if (m_config.dynamic_node_detection() && should_check_cluster())
{
check_cluster(Clustrix::Softfailed::REJECT);
@ -300,6 +302,11 @@ void ClustrixMonitor::tick()
}
break;
}
flush_server_status();
process_state_changes();
hangup_failed_servers();
store_server_journal(nullptr);
}
void ClustrixMonitor::choose_hub(Clustrix::Softfailed softfailed)

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

@ -350,9 +350,10 @@ json_t* MariaDBMonitor::to_json() const
void MariaDBMonitor::pre_loop()
{
// MonitorInstance reads the journal and has the last known master in its m_master member variable.
// Read the journal and the last known master.
// Write the corresponding MariaDBServer into the class-specific m_master variable.
auto journal_master = MonitorWorker::m_master;
MonitorServer* journal_master = nullptr;
load_server_journal(&journal_master);
if (journal_master)
{
// This is somewhat questionable, as the journal only contains status bits but no actual topology
@ -375,6 +376,8 @@ void MariaDBMonitor::pre_loop()
void MariaDBMonitor::tick()
{
check_maintenance_requests();
/* Update MonitorServer->pending_status. This is where the monitor loop writes it's findings.
* Also, backup current status so that it can be compared to any deduced state. */
for (auto srv : m_servers)
@ -463,10 +466,10 @@ void MariaDBMonitor::tick()
log_master_changes();
// Before exiting, we need to store the current master into the m_master
// member variable of MonitorInstance so that the right server will be
// stored to the journal.
MonitorWorker::m_master = m_master ? m_master->m_server_base : NULL;
flush_server_status();
process_state_changes();
hangup_failed_servers();
store_server_journal(m_master ? m_master->m_server_base : nullptr);
}
void MariaDBMonitor::process_state_changes()