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

Do not auto_rejoin if maxscale is passive

Browse Source
This commit is contained in:
Esa Korhonen
2018-02-14 16:21:08 +02:00
parent 67834ca433
commit 754d80da75
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/modules/monitor/mariadbmon/mariadbmon.cc
View File

@ -2563,7 +2563,8 @@ monitorMain(void *arg)
// Do not auto-join servers on this monitor loop if a failover (or any other cluster modification) // Do not auto-join servers on this monitor loop if a failover (or any other cluster modification)
// has been performed, as server states have not been updated yet. It will happen next iteration. // has been performed, as server states have not been updated yet. It will happen next iteration.
if (handle->auto_rejoin && !failover_performed && cluster_can_be_joined(handle)) if (!config_get_global_options()->passive && handle->auto_rejoin &&
!failover_performed && cluster_can_be_joined(handle))
{ {
// Check if any servers should be autojoined to the cluster // Check if any servers should be autojoined to the cluster
ServerVector joinable_servers; ServerVector joinable_servers;