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

Remove old code

Browse Source 
The functionality is elsewhere.
This commit is contained in:
Esa Korhonen
2018-07-02 16:50:13 +03:00
parent fd31c9cced
commit 03491a45f0
2 changed files with 0 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
server/modules/monitor/mariadbmon/cluster_discovery.cc
View File

@ -242,57 +242,6 @@ void MariaDBMonitor::find_graph_cycles()
tarjan_scc_visit_node(*iter, &stack, &index, &cycle);
}
}
assign_cycle_roles(cycle);
}
void MariaDBMonitor::assign_cycle_roles(int cycle)
{
// TODO: This part needs to be rewritten as it's faulty. And moved elsewhere.
for (auto iter = m_servers.begin(); iter != m_servers.end(); iter++)
{
MariaDBServer& server = **iter;
MXS_MONITORED_SERVER* mon_srv = server.m_server_base;
if (server.m_node.cycle != NodeData::CYCLE_NONE)
{
/** We have at least one cycle in the graph */
if (server.m_read_only)
{
monitor_set_pending_status(mon_srv, SERVER_SLAVE | SERVER_WAS_SLAVE);
monitor_clear_pending_status(mon_srv, SERVER_MASTER);
}
else
{
monitor_set_pending_status(mon_srv, SERVER_MASTER);
monitor_clear_pending_status(mon_srv, SERVER_SLAVE | SERVER_WAS_SLAVE);
}
}
else if (m_detect_stale_master && cycle == 1 && mon_srv->mon_prev_status & SERVER_MASTER &&
(mon_srv->pending_status & SERVER_MASTER) == 0)
{
/**
* Stale master detection is handled here for multi-master mode.
*
* If we know that no cycles were found from the graph and that a
* server once had the master status, replication has broken
* down. These masters are assigned the stale master status allowing
* them to be used as masters even if they lose their slaves. A
* slave in this case can be either a normal slave or another
* master.
*/
if (server.m_read_only)
{
/** The master is in read-only mode, set it into Slave state */
monitor_set_pending_status(mon_srv, SERVER_SLAVE | SERVER_WAS_SLAVE);
monitor_clear_pending_status(mon_srv, SERVER_MASTER | SERVER_WAS_MASTER);
}
else
{
monitor_set_pending_status(mon_srv, SERVER_MASTER | SERVER_WAS_MASTER);
monitor_clear_pending_status(mon_srv, SERVER_SLAVE | SERVER_WAS_SLAVE);
}
}
}
}
/**

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

@ -207,7 +207,6 @@ private:
void check_maxscale_schema_replication();
void build_replication_graph();
void tarjan_scc_visit_node(MariaDBServer *node, ServerArray* stack, int *index, int *cycle);
void assign_cycle_roles(int cycle);
MariaDBServer* find_topology_master_server(std::string* msg_out);
MariaDBServer* find_best_reach_server(const ServerArray& candidates);
void calculate_node_reach(MariaDBServer* node);