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

Merge branch 'read_only' into develop

Browse Source 
develop was updated before a merge was pushed, requiring a second merge.
This commit is contained in:
Esa Korhonen
2018-05-18 16:51:38 +03:00
parent f88f0ffe47 709c076000
commit 4788c4947d
4 changed files with 56 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,6 +130,7 @@ private:
int64_t m_master_gtid_domain; /**< gtid_domain_id most recently seen on the master */
std::string m_external_master_host; /**< External master host, for fail/switchover */
int m_external_master_port; /**< External master port */
bool m_cluster_modified; /**< Has an automatic failover/rejoin been performed this loop? */
// Replication topology detection settings
bool m_allow_cluster_recovery; /**< Allow failed servers to rejoin the cluster */
@ -155,6 +156,7 @@ private:
* autoselect switchover. */
std::string m_promote_sql_file; /**< File with sql commands which are ran to a server being promoted. */
std::string m_demote_sql_file; /**< File with sql commands which are ran to a server being demoted. */
bool m_enforce_read_only_slaves; /**< Should the monitor set read-only=1 on any slave servers. */
// Other settings
std::string m_script; /**< Script to call when state changes occur on servers */
@ -236,9 +238,12 @@ private:
bool start_external_replication(MariaDBServer* new_master, json_t** err_out);
bool wait_cluster_stabilization(MariaDBServer* new_master, const ServerArray& slaves,
int seconds_remaining);
// Other methods
void disable_setting(const char* setting);
void load_journal();
bool check_sql_files();
void enforce_read_only_on_slaves();
};
/**