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

Remove SERVER->slaves field

Browse Source 
The field was only used by MariaDB-Monitor. A later commit will add equivalent
information to the monitor diagnostics function.
This commit is contained in:
Esa Korhonen
2018-04-27 16:19:57 +03:00
parent b6eff12334
commit b44f2cfa36
3 changed files with 0 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
server/core/server.cc
View File

@ -516,24 +516,6 @@ dprintServer(DCB *dcb, const SERVER *server)
mon_get_event_name((mxs_monitor_event_t)server->last_event));
time_t t = maxscale_started() + MXS_CLOCK_TO_SEC(server->triggered_at);
dcb_printf(dcb, "\tTriggered at: %s\n", http_to_date(t).c_str());
if (server->slaves)
{
int i;
dcb_printf(dcb, "\tSlave Ids: ");
for (i = 0; server->slaves[i]; i++)
{
if (i == 0)
{
dcb_printf(dcb, "%li", server->slaves[i]);
}
else
{
dcb_printf(dcb, ", %li ", server->slaves[i]);
}
}
dcb_printf(dcb, "\n");
}
dcb_printf(dcb, "\tRepl Depth: %d\n", server->depth);
if (SERVER_IS_SLAVE(server) || SERVER_IS_RELAY_SERVER(server))
{
@ -1468,18 +1450,6 @@ static json_t* server_json_attributes(const SERVER* server)
json_object_set_new(attr, "last_event", json_string(event_name));
json_object_set_new(attr, "triggered_at", json_string(http_to_date(t).c_str()));
if (server->slaves)
{
json_t* slaves = json_array();
for (int i = 0; server->slaves[i]; i++)
{
json_array_append_new(slaves, json_integer(server->slaves[i]));
}
json_object_set_new(attr, "slaves", slaves);
}
if (server->rlag >= 0)
{
json_object_set_new(attr, "replication_lag", json_integer(server->rlag));