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

Remove old "detect_standalone_master"-feature, update documentation

Browse Source 
The auto_failover is a more reliable solution and should be used instead. Several
unused parameters were removed, although they can still be defined in the config
file. Updated documentation on the relevant parts.
This commit is contained in:
Esa Korhonen
2018-07-04 15:16:01 +03:00
parent f7538db3b7
commit 936bcde135
6 changed files with 42 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/modules/monitor/mariadbmon/mariadbserver.cc
View File

@ -487,7 +487,7 @@ const char* MariaDBServer::name() const
return m_server_base->server->name;
}
string MariaDBServer::diagnostics(bool multimaster) const
string MariaDBServer::diagnostics() const
{
std::stringstream ss;
ss << "Server: " << name() << "\n";
@ -507,14 +507,14 @@ string MariaDBServer::diagnostics(bool multimaster) const
{
ss << "Gtid binlog position: " << m_gtid_binlog_pos.to_string() << "\n";
}
if (multimaster)
if (m_node.cycle != NodeData::CYCLE_NONE)
{
ss << "Master group: " << m_node.cycle << "\n";
}
return ss.str();
}
json_t* MariaDBServer::diagnostics_json(bool multimaster) const
json_t* MariaDBServer::diagnostics_json() const
{
json_t* srv = json_object();
json_object_set_new(srv, "name", json_string(name()));
@ -541,7 +541,7 @@ json_t* MariaDBServer::diagnostics_json(bool multimaster) const
json_object_set_new(srv, "gtid_io_pos",
json_string(m_slave_status[0].gtid_io_pos.to_string().c_str()));
}
if (multimaster)
if (m_node.cycle != NodeData::CYCLE_NONE)
{
json_object_set_new(srv, "master_group", json_integer(m_node.cycle));
}