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

MXS-2275 Fix breakage due to rebasing

Browse Source
This commit is contained in:
Johan Wikman
2019-02-01 09:12:39 +02:00
parent 6d60714a17
commit 55b1e031d6
5 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/modules/monitor/clustrixmon/clustrixmonitor.cc
View File

@ -169,7 +169,7 @@ void ClustrixMonitor::choose_hub()
auto& element = *it;
ClustrixNode& node = element.second;
if (node.can_be_used_as_hub(m_settings.conn_settings))
if (node.can_be_used_as_hub(m_name, m_settings.conn_settings))
{
pHub_con = node.release_connection();
pHub_server = node.server();
@ -189,7 +189,7 @@ void ClustrixMonitor::choose_hub()
if (ips.find(ms.server->address) == ips.end())
{
if (Clustrix::ping_or_connect_to_hub(m_settings.conn_settings, ms))
if (Clustrix::ping_or_connect_to_hub(m_name, m_settings.conn_settings, ms))
{
pHub_con = ms.con;
pHub_server = ms.server;
@ -395,7 +395,7 @@ void ClustrixMonitor::check_hub()
mxb_assert(m_pHub_con);
mxb_assert(m_pHub_server);
if (!Clustrix::ping_or_connect_to_hub(m_settings.conn_settings, *m_pHub_server, &m_pHub_con))
if (!Clustrix::ping_or_connect_to_hub(m_name, m_settings.conn_settings, *m_pHub_server, &m_pHub_con))
{
mysql_close(m_pHub_con);
m_pHub_con = nullptr;