Merge branch '2.3' into develop

This commit is contained in:
Esa Korhonen
2019-04-24 13:29:04 +03:00
34 changed files with 774 additions and 681 deletions

View File

@ -480,6 +480,29 @@ public:
// Replicates from a host and a port instead of a known server
void replicate_from(int slave, const std::string& host, uint16_t port, const char* type = "current_pos");
/**
* @brief limit_nodes Restart replication for only new_N nodes
* @param new_N new number of nodes in replication
*/
void limit_nodes(int new_N);
/**
* @brief cnf_servers Generates backend servers description for maxscale.cnf
* @return Servers description including IPs, ports
*/
std::string cnf_servers();
/**
* @brief cnf_servers_line Generates list of backend servers for serivces definition in maxscale.cnf
* @return List of servers, e.g server1,server2,server3,...
*/
std::string cnf_servers_line();
/**
* @brief cnf_server_name Prefix for backend server name ('server', 'gserver')
*/
std::string cnf_server_name;
private:
bool check_master_node(MYSQL* conn);