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

MXS-1775 Rearrange for moving main loop to MonitorInstance

Browse Source 
This is another step in the process for moving the main loop
from MariaDBMonitor to MonitorInstance.
This commit is contained in:
Johan Wikman
2018-06-05 12:47:34 +03:00
parent 5172c43e29
commit 71194d83d3
4 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/modules/monitor/mariadbmon/mariadbmon.hh
View File

@ -100,6 +100,7 @@ public:
protected:
void update_server_status(MXS_MONITORED_SERVER* pMonitored_server);
void pre_loop();
void main();
private:
@ -146,6 +147,7 @@ private:
std::string m_script; /**< Script to call when state changes occur on servers */
uint64_t m_events; /**< enabled events */
bool m_warn_set_standalone_master; /**< Log a warning when setting standalone master */
bool m_log_no_master; /**< Should it be logged that there is no master */
enum slave_down_setting_t
{
@ -171,7 +173,7 @@ private:
bool standalone_master_required();
bool set_standalone_master();
void assign_relay_master(MariaDBServer& serv_info);
void log_master_changes(MariaDBServer* root_master, int* log_no_master);
void log_master_changes(MariaDBServer* root_master);
void update_gtid_domain();
void update_external_master();
void set_master_heartbeat(MariaDBServer*);
@ -229,7 +231,6 @@ private:
// Other methods
void disable_setting(const char* setting);
void load_journal();
bool check_sql_files();
void enforce_read_only_on_slaves();
};