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

Fix connection merging

Browse Source 
The conditional was inverted.
This commit is contained in:
Esa Korhonen
2018-10-15 15:11:33 +03:00
parent e0c46a9c9a
commit 36b666898c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/modules/monitor/mariadbmon/mariadbserver.cc
View File

@ -1936,11 +1936,6 @@ bool MariaDBServer::merge_slave_conns(ClusterOperation& op, const SlaveStatusArr
SlaveStatus slave_conn = conns_to_merge[i]; SlaveStatus slave_conn = conns_to_merge[i];
string ignore_reason; string ignore_reason;
if (conn_can_be_merged(slave_conn, &ignore_reason)) if (conn_can_be_merged(slave_conn, &ignore_reason))
{
MXS_WARNING("%s was ignored when promoting %s because %s",
slave_conn.to_short_string().c_str(), name(), ignore_reason.c_str());
}
else
{ {
if (check_modify_conn_name(&slave_conn)) if (check_modify_conn_name(&slave_conn))
{ {
@ -1958,6 +1953,12 @@ bool MariaDBServer::merge_slave_conns(ClusterOperation& op, const SlaveStatusArr
error = true; error = true;
} }
} }
else
{
mxb_assert(!ignore_reason.empty());
MXS_WARNING("%s was ignored when promoting %s because %s",
slave_conn.to_short_string().c_str(), name(), ignore_reason.c_str());
}
} }
return !error; return !error;