diff --git a/include/maxscale/server.h b/include/maxscale/server.h index 33243be10..426332a15 100644 --- a/include/maxscale/server.h +++ b/include/maxscale/server.h @@ -148,7 +148,6 @@ typedef struct server unsigned long node_ts; /**< Last timestamp set from M/S monitor module */ long master_id; /**< Master server id of this node */ int depth; /**< Replication level in the tree */ - long slaves[MAX_NUM_SLAVES]; /**< Slaves of this node */ // Misc fields char *auth_options; /**< Authenticator options, not used. TODO: Remove. */ bool master_err_is_logged; /**< If node failed, this indicates whether it is logged. Only used diff --git a/server/core/server.cc b/server/core/server.cc index 1863bb06f..7074c2928 100644 --- a/server/core/server.cc +++ b/server/core/server.cc @@ -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)); diff --git a/server/modules/monitor/mariadbmon/cluster_discovery.cc b/server/modules/monitor/mariadbmon/cluster_discovery.cc index d4513f585..19dc26425 100644 --- a/server/modules/monitor/mariadbmon/cluster_discovery.cc +++ b/server/modules/monitor/mariadbmon/cluster_discovery.cc @@ -16,7 +16,6 @@ #include #include -static int add_slave_to_master(long *slaves_list, int list_size, long node_id); static bool check_replicate_ignore_table(MXS_MONITORED_SERVER* database); static bool check_replicate_do_table(MXS_MONITORED_SERVER* database); static bool check_replicate_wild_do_table(MXS_MONITORED_SERVER* database); @@ -118,8 +117,6 @@ MXS_MONITORED_SERVER* MariaDBMonitor::get_replication_tree() master_cand = getServerByNodeId(current->master_id); if (master_cand && master_cand->server && master_cand->server->node_id > 0) { - add_slave_to_master(master_cand->server->slaves, sizeof(master_cand->server->slaves), - current->node_id); master_cand->server->depth = current->depth - 1; if (m_master && master_cand->server->depth < m_master->m_server_base->server->depth) @@ -177,28 +174,6 @@ MXS_MONITORED_SERVER* MariaDBMonitor::get_replication_tree() } } -/******* - * This function add a slave id into the slaves server field - * of its master server - * - * @param slaves_list The slave list array of the master server - * @param list_size The size of the slave list - * @param node_id The node_id of the slave to be inserted - * @return 1 for inserted value and 0 otherwise - */ -static int add_slave_to_master(long *slaves_list, int list_size, long node_id) -{ - for (int i = 0; i < list_size; i++) - { - if (slaves_list[i] == 0) - { - slaves_list[i] = node_id; - return 1; - } - } - return 0; -} - /** * Fetch a node by node_id * @@ -903,9 +878,6 @@ void MariaDBMonitor::monitor_one_server(MariaDBServer& server) /* monitor current node */ monitor_database(get_server_info(ptr)); - /* reset the slave list of current node */ - memset(&ptr->server->slaves, 0, sizeof(ptr->server->slaves)); - if (mon_status_changed(ptr)) { if (SRV_MASTER_STATUS(ptr->mon_prev_status))