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

MXS-2546 Save master server to slave connection object

Browse Source 
Simplifies later checks and removes duplicate code. The "assume_unique_hostnames"-
setting is no longer required within the MariaDBServer-class.
This commit is contained in:
Esa Korhonen
2019-07-17 18:48:46 +03:00
parent 2a1925744b
commit 5df1f2561c
6 changed files with 39 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,6 +221,8 @@ private:
* TODO: think about removing */
bool ignore_external_masters {false}; /* Ignore masters outside of the monitor configuration.
* TODO: requires work */
bool assume_unique_hostnames {true}; /* Are server hostnames consistent between MaxScale and
* servers */
int failcount {1}; /* Number of ticks master must be down before it's considered
* totally down, allowing failover or master change. */
@ -264,7 +266,7 @@ private:
std::string diagnostics_to_string() const;
json_t* to_json() const;
MariaDBServer* get_server(const std::string& host, int port);
MariaDBServer* get_server(const EndPoint& search_ep);
MariaDBServer* get_server(int64_t id);
MariaDBServer* get_server(mxs::MonitorServer* mon_server);
MariaDBServer* get_server(SERVER* server);