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

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä
2019-07-10 09:09:24 +03:00
parent 8a176d64aa c7d90636b0
commit a91726100c
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/modules/monitor/galeramon/galeramon.cc
View File

@ -436,9 +436,15 @@ MXS_MONITORED_SERVER* GaleraMonitor::get_candidate_master()
} }
} }
} }
else if (moitor_servers->server->node_id >= 0 else if (moitor_servers->server->node_id >= 0)
&& (!m_use_priority || candidate_master == NULL))
{ {
if (m_use_priority && candidate_master
&& server_get_parameter(candidate_master->server, "priority", buf, sizeof(buf)))
{
// Current candidate has priority but this node doesn't, current candidate is better
continue;
}
// Server priorities are not in use or no candidate has been found // Server priorities are not in use or no candidate has been found
if (min_id < 0 || moitor_servers->server->node_id < min_id) if (min_id < 0 || moitor_servers->server->node_id < min_id)
{ {