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:
Esa Korhonen
2019-04-24 12:51:32 +03:00
parent f8c964163f 64a8288f66
commit b972d88bba
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/Monitors/MariaDB-Monitor.md
View File

@ -567,6 +567,11 @@ moment the rejoining server lost connection, the rejoining server cannot
continue replication. This is an issue if the master has changed and continue replication. This is an issue if the master has changed and
the new master does not have *log_slave_updates* on. 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 ### External master support
The monitor detects if a server in the cluster is replicating from an external The monitor detects if a server in the cluster is replicating from an external
@ -600,11 +605,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 MaxScale is configured as a passive instance. For details on how MaxScale
behaves in passive mode, see the documentation on `failover_timeout` below. 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. The monitor user must have the SUPER and RELOAD privileges for failover to work.
#### `auto_rejoin` #### `auto_rejoin`

2
maxscale-system-test/maxscales.h
View File

@ -21,7 +21,7 @@ public:
}; };
Maxscales(const char *pref, const char *test_cwd, bool verbose, bool use_valgrind, 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(); int read_env();