From f90863761efb3bd566630d3ffb373d798a6cf235 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Thu, 18 Apr 2019 03:48:51 +0300 Subject: [PATCH 1/2] remove unneccesary __cxx11 --- maxscale-system-test/maxscales.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maxscale-system-test/maxscales.h b/maxscale-system-test/maxscales.h index 038c081b0..3be762ac9 100644 --- a/maxscale-system-test/maxscales.h +++ b/maxscale-system-test/maxscales.h @@ -21,7 +21,7 @@ public: }; Maxscales(const char *pref, const char *test_cwd, bool verbose, bool use_valgrind, - std::__cxx11::string network_config); + std::string network_config); int read_env(); From 64a8288f664f61d42700a292270fc58ea5f49567 Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Tue, 16 Apr 2019 17:40:27 +0300 Subject: [PATCH 2/2] MXS-2426 Document the change in cluster operation failure handling --- Documentation/Monitors/MariaDB-Monitor.md | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Documentation/Monitors/MariaDB-Monitor.md b/Documentation/Monitors/MariaDB-Monitor.md index 5b2d77f20..5320af9b7 100644 --- a/Documentation/Monitors/MariaDB-Monitor.md +++ b/Documentation/Monitors/MariaDB-Monitor.md @@ -332,6 +332,11 @@ moment the rejoining server lost connection, the rejoining server cannot continue replication. This is an issue if the master has changed and the new master does not have *log_slave_updates* on. +If an automatic cluster operation such as auto-failover or auto-rejoin fails, +all cluster modifying operations are disabled for `failcount` monitor iterations, +after which the operation may be retried. Similar logic applies if the cluster is +unsuitable for such operations, e.g. replication is not using GTID. + ### External master support The monitor detects if a server in the cluster is replicating from an external @@ -365,11 +370,6 @@ a number of iterations given in `failcount`. Failover will not take place when MaxScale is configured as a passive instance. For details on how MaxScale behaves in passive mode, see the documentation on `failover_timeout` below. -If an attempt at failover fails or multiple master servers are detected, an -error is logged and automatic failover is disabled. If this happens, the cluster -must be fixed manually and the failover needs to be re-enabled via the REST API -or MaxAdmin. - The monitor user must have the SUPER and RELOAD privileges for failover to work. #### `auto_rejoin` @@ -497,9 +497,6 @@ MaxAdmin. The commands are only performed when MaxScale is in active mode. It is safe to perform switchover or failover even with `auto_failover` on, since the automatic operation cannot happen simultaneously with the manual one. -If a switchover or failover fails, automatic failover is disabled. It can be -turned on manually via the REST API or MaxAdmin. - When switchover is iniated via the REST-API, the URL path is: ``` /v1/maxscale/mariadbmon/switchover?&&