From 8558ace8018cd8e546687823c961449ff80cfcd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Wed, 7 Feb 2018 08:27:17 +0200 Subject: [PATCH] Clean up ignore_external_masters code Removed redundant checks and cleared only bits that aren't already cleared. --- server/modules/monitor/mariadbmon/mysql_mon.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/server/modules/monitor/mariadbmon/mysql_mon.cc b/server/modules/monitor/mariadbmon/mysql_mon.cc index fb97800b1..9a7dc2e4d 100644 --- a/server/modules/monitor/mariadbmon/mysql_mon.cc +++ b/server/modules/monitor/mariadbmon/mysql_mon.cc @@ -2365,13 +2365,10 @@ monitorMain(void *arg) * This allows parts of a multi-tiered replication setup to be used * in MaxScale. */ - if (SERVER_IS_SLAVE_OF_EXTERNAL_MASTER(root_master->server) && - SERVER_IS_MASTER(root_master->server) && handle->ignore_external_masters) + if (handle->ignore_external_masters) { - monitor_clear_pending_status(root_master, - SERVER_SLAVE | SERVER_SLAVE_OF_EXTERNAL_MASTER); - server_clear_status_nolock(root_master->server, - SERVER_SLAVE | SERVER_SLAVE_OF_EXTERNAL_MASTER); + monitor_clear_pending_status(root_master, SERVER_SLAVE_OF_EXTERNAL_MASTER); + server_clear_status_nolock(root_master->server, SERVER_SLAVE_OF_EXTERNAL_MASTER); } }