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

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Markus Mäkelä
2020-12-11 16:38:43 +02:00
parent e3aff8babe 43068d20b4
commit 27a43fdf9d
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/Routers/ReadWriteSplit.md
View File

@ -478,8 +478,9 @@ even if the duration is longer than a second.
### `transaction_replay` ### `transaction_replay`
Replay interrupted transactions. This parameter was added in MaxScale 2.3.0 and Replay interrupted transactions. This parameter was added in MaxScale 2.3.0 and
is disabled by default. Enabling this parameter implicitly enables both the is disabled by default. Enabling this parameter enables both `delayed_retry` and
`delayed_retry` and `master_reconnection` parameters. `master_reconnection` and sets `master_failure_mode` to `fail_on_write`, thereby
overriding any configured values for these parameters.
When the server where the transaction is in progress fails, readwritesplit can When the server where the transaction is in progress fails, readwritesplit can
migrate the transaction to a replacement server. This can completely hide the migrate the transaction to a replacement server. This can completely hide the

6
server/modules/monitor/galeramon/galeramon.cc
View File

@ -200,7 +200,11 @@ void GaleraMonitor::update_server_status(MonitorServer* monitored_server)
/* Check if the the Galera FSM shows this node is joined to the cluster */ /* Check if the the Galera FSM shows this node is joined to the cluster */
const char* cluster_member = const char* cluster_member =
"SHOW STATUS WHERE Variable_name IN" " SELECT * FROM ("
" SELECT * FROM information_schema.SESSION_STATUS"
" UNION"
" SELECT * FROM information_schema.SESSION_VARIABLES) AS t"
" WHERE Variable_name IN"
" ('wsrep_cluster_state_uuid'," " ('wsrep_cluster_state_uuid',"
" 'wsrep_cluster_size'," " 'wsrep_cluster_size',"
" 'wsrep_local_index'," " 'wsrep_local_index',"