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

Clean up JSON diagnostics

Browse Source 
Now prints all slave connections.
This commit is contained in:
Esa Korhonen
2018-08-21 16:30:01 +03:00
parent 916b72a733
commit f2dfd39f79
4 changed files with 54 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
server/modules/monitor/mariadbmon/mariadbmon.cc
View File

@ -302,7 +302,7 @@ json_t* MariaDBMonitor::diagnostics_json() const
MariaDBMonitor* mutable_ptr = const_cast<MariaDBMonitor*>(this); MariaDBMonitor* mutable_ptr = const_cast<MariaDBMonitor*>(this);
auto func = [this, &rval] auto func = [this, &rval]
{ {
rval = diagnostics_to_json(); rval = to_json();
}; };
if (!mutable_ptr->call(func, Worker::EXECUTE_AUTO)) if (!mutable_ptr->call(func, Worker::EXECUTE_AUTO))
@ -313,19 +313,20 @@ json_t* MariaDBMonitor::diagnostics_json() const
return rval; return rval;
} }
json_t* MariaDBMonitor::diagnostics_to_json() const json_t* MariaDBMonitor::to_json() const
{ {
json_t* rval = MonitorInstance::diagnostics_json(); json_t* rval = MonitorInstance::diagnostics_json();
if (!m_servers.empty()) json_object_set_new(rval, "master", m_master == NULL ? json_null() : json_string(m_master->name()));
{ json_object_set_new(rval, "master_gtid_domain_id",
json_t* arr = json_array(); m_master_gtid_domain == GTID_DOMAIN_UNKNOWN ? json_null() :
for (auto iter = m_servers.begin(); iter != m_servers.end(); iter++) json_integer(m_master_gtid_domain));
{
json_array_append_new(arr, (*iter)->diagnostics_json());
}
json_object_set_new(rval, "server_info", arr);
}
json_t* server_info = json_array();
for (MariaDBServer* server : m_servers)
{
json_array_append_new(server_info, server->to_json());
}
json_object_set_new(rval, "server_info", server_info);
return rval; return rval;
} }

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

@ -189,7 +189,7 @@ private:
MariaDBServer* get_server(SERVER* server); MariaDBServer* get_server(SERVER* server);
bool execute_manual_command(std::function<void ()> command, json_t** error_out); bool execute_manual_command(std::function<void ()> command, json_t** error_out);
std::string diagnostics_to_string() const; std::string diagnostics_to_string() const;
json_t* diagnostics_to_json() const; json_t* to_json() const;
// Cluster discovery and status assignment methods // Cluster discovery and status assignment methods
void update_server(MariaDBServer* server); void update_server(MariaDBServer* server);

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

@ -529,43 +529,31 @@ string MariaDBServer::diagnostics() const
return ss.str(); return ss.str();
} }
json_t* MariaDBServer::diagnostics_json() const json_t* MariaDBServer::to_json() const
{ {
json_t* srv = json_object(); json_t* result = json_object();
json_object_set_new(srv, "name", json_string(name())); json_object_set_new(result, "name", json_string(name()));
json_object_set_new(srv, "server_id", json_integer(m_server_id)); json_object_set_new(result, "server_id", json_integer(m_server_id));
json_object_set_new(srv, "read_only", json_boolean(m_read_only)); json_object_set_new(result, "read_only", json_boolean(m_read_only));
json_object_set_new(srv, "slave_configured", json_boolean(!m_slave_status.empty()));
if (!m_slave_status.empty()) json_object_set_new(result, "gtid_current_pos",
m_gtid_current_pos.empty() ? json_null() :
json_string(m_gtid_current_pos.to_string().c_str()));
json_object_set_new(result, "gtid_binlog_pos",
m_gtid_binlog_pos.empty() ? json_null() :
json_string(m_gtid_binlog_pos.to_string().c_str()));
json_object_set_new(result, "master_group",
(m_node.cycle == NodeData::CYCLE_NONE) ? json_null() : json_integer(m_node.cycle));
json_t* slave_connections = json_array();
for (const auto& sstatus : m_slave_status)
{ {
json_object_set_new(srv, "slave_io_running", json_array_append_new(slave_connections, sstatus.to_json());
json_string(SlaveStatus::slave_io_to_string(m_slave_status[0].slave_io_running).c_str()));
json_object_set_new(srv, "slave_sql_running", json_boolean(m_slave_status[0].slave_sql_running));
json_object_set_new(srv, "master_id", json_integer(m_slave_status[0].master_server_id));
} }
if (!m_gtid_current_pos.empty()) json_object_set_new(result, "slave_connections", slave_connections);
{ return result;
json_object_set_new(srv, "gtid_current_pos", json_string(m_gtid_current_pos.to_string().c_str()));
}
if (!m_gtid_binlog_pos.empty())
{
json_object_set_new(srv, "gtid_binlog_pos", json_string(m_gtid_binlog_pos.to_string().c_str()));
}
if (!m_slave_status.empty() && !m_slave_status[0].gtid_io_pos.empty())
{
json_object_set_new(srv, "gtid_io_pos",
json_string(m_slave_status[0].gtid_io_pos.to_string().c_str()));
}
if (!m_slave_status.empty())
{
json_object_set_new(srv, "seconds_behind_master",
json_integer(m_slave_status[0].seconds_behind_master));
}
if (m_node.cycle != NodeData::CYCLE_NONE)
{
json_object_set_new(srv, "master_group", json_integer(m_node.cycle));
}
return srv;
} }
bool MariaDBServer::uses_gtid(std::string* error_out) bool MariaDBServer::uses_gtid(std::string* error_out)
@ -1152,6 +1140,23 @@ string SlaveStatus::to_string() const
return rval; return rval;
} }
json_t* SlaveStatus::to_json() const
{
json_t* result = json_object();
json_object_set_new(result, "connection_name", json_string(name.c_str()));
json_object_set_new(result, "master_host", json_string(master_host.c_str()));
json_object_set_new(result, "master_port", json_integer(master_port));
json_object_set_new(result, "slave_io_running",
json_string(slave_io_to_string(slave_io_running).c_str()));
json_object_set_new(result, "slave_sql_running", json_string(slave_sql_running ? "Yes" : "No"));
json_object_set_new(result, "seconds_behing_master",
seconds_behind_master == MXS_RLAG_UNDEFINED ? json_null() :
json_integer(seconds_behind_master));
json_object_set_new(result, "master_server_id", json_integer(master_server_id));
json_object_set_new(result, "last_io_or_sql_error", json_string(last_error.c_str()));
json_object_set_new(result, "gtid_io_pos", json_string(gtid_io_pos.to_string().c_str()));
return result;
}
SlaveStatus::slave_io_running_t SlaveStatus::slave_io_from_string(const std::string& str) SlaveStatus::slave_io_running_t SlaveStatus::slave_io_from_string(const std::string& str)
{ {
slave_io_running_t rval = SLAVE_IO_NO; slave_io_running_t rval = SLAVE_IO_NO;

3
server/modules/monitor/mariadbmon/mariadbserver.hh
View File

@ -55,6 +55,7 @@ public:
int seconds_behind_master = MXS_RLAG_UNDEFINED; /* How much behind the slave is. */ int seconds_behind_master = MXS_RLAG_UNDEFINED; /* How much behind the slave is. */
std::string to_string() const; std::string to_string() const;
json_t* to_json() const;
static slave_io_running_t slave_io_from_string(const std::string& str); static slave_io_running_t slave_io_from_string(const std::string& str);
static std::string slave_io_to_string(slave_io_running_t slave_io); static std::string slave_io_to_string(slave_io_running_t slave_io);
}; };
@ -350,7 +351,7 @@ public:
* *
* @return Json diagnostics object * @return Json diagnostics object
*/ */
json_t* diagnostics_json() const; json_t* to_json() const;
/** /**
* Print server information to a string. * Print server information to a string.