From 754d80da753a384385b3d4c5c8aa9aa24750bb5a Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Wed, 14 Feb 2018 16:21:08 +0200 Subject: [PATCH] Do not auto_rejoin if maxscale is passive --- server/modules/monitor/mariadbmon/mariadbmon.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/modules/monitor/mariadbmon/mariadbmon.cc b/server/modules/monitor/mariadbmon/mariadbmon.cc index 7b02b5ee8..d73bf4603 100644 --- a/server/modules/monitor/mariadbmon/mariadbmon.cc +++ b/server/modules/monitor/mariadbmon/mariadbmon.cc @@ -2563,7 +2563,8 @@ monitorMain(void *arg) // 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. - 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 ServerVector joinable_servers;