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

10
server/modules/monitor/clustrixmon/clustrix.cc
View File

@ -156,15 +156,17 @@ bool Clustrix::is_part_of_the_quorum(const char* zName, const SERVER& server, MY
return rv;
}
bool Clustrix::ping_or_connect_to_hub(const MXS_MONITORED_SERVER::ConnectionSettings& sett, SERVER& server,
bool Clustrix::ping_or_connect_to_hub(const char* zName,
const MXS_MONITORED_SERVER::ConnectionSettings& settings,
SERVER& server,
MYSQL** ppCon)
{
bool connected = false;
mxs_connect_result_t rv = mon_ping_or_connect_to_db(sett, server, ppCon);
mxs_connect_result_t rv = mon_ping_or_connect_to_db(settings, server, ppCon);
if (mon_connection_is_ok(rv))
{
if (Clustrix::is_part_of_the_quorum(mon.m_name, server, *ppCon))
if (Clustrix::is_part_of_the_quorum(zName, server, *ppCon))
{
connected = true;
}
@ -172,7 +174,7 @@ bool Clustrix::ping_or_connect_to_hub(const MXS_MONITORED_SERVER::ConnectionSett
else
{
MXS_ERROR("%s: Could either not ping or create connection to %s:%d: %s",
mon.m_name, server.address, server.port, mysql_error(*ppCon));
zName, server.address, server.port, mysql_error(*ppCon));
}
return connected;