diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-21 11:33:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-21 11:33:59 +0300 |
| commit | 394784095eeedb3a2915249fe14a9d2e1f91a23a (patch) | |
| tree | 0a2e7ad98bfa382744d87c6af6eb91f4bfc3858d /mysql-test/suite/galera/galera_2nodes.cnf | |
| parent | d7189fbcb4dadf23d615a5f3a26aba1d4e37178f (diff) | |
| parent | 4730314a70119ae5857edffe2d1bec86960ef22b (diff) | |
| download | mariadb-git-394784095eeedb3a2915249fe14a9d2e1f91a23a.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/suite/galera/galera_2nodes.cnf')
| -rw-r--r-- | mysql-test/suite/galera/galera_2nodes.cnf | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/mysql-test/suite/galera/galera_2nodes.cnf b/mysql-test/suite/galera/galera_2nodes.cnf index ef8a17a77be..352a68b06e6 100644 --- a/mysql-test/suite/galera/galera_2nodes.cnf +++ b/mysql-test/suite/galera/galera_2nodes.cnf @@ -7,30 +7,24 @@ binlog-format=row innodb-autoinc-lock-mode=2 default-storage-engine=innodb wsrep-provider=@ENV.WSREP_PROVIDER -wsrep_node_address=127.0.0.1 # enforce read-committed characteristics across the cluster wsrep-sync-wait=15 -# lock schedule alg appears to be VATS by default, and it is not -# yet compatible with galera -innodb_lock_schedule_algorithm=FCFS +wsrep-on=1 [mysqld.1] loose-innodb #galera_port=@OPT.port #ist_port=@OPT.port #sst_port=@OPT.port -wsrep-on=1 wsrep-cluster-address=gcomm:// wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.1.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S;gcache.size=10M' +wsrep_node_address='127.0.0.1:@mysqld.1.#galera_port' wsrep_node_incoming_address=127.0.0.1:@mysqld.1.port wsrep_sst_receive_address='127.0.0.1:@mysqld.1.#sst_port' # enforce read-committed characteristics across the cluster wsrep_causal_reads=ON wsrep_sync_wait = 15 -# lock schedule alg appears to be VATS by default, and it is not -# yet compatible with galera -innodb_lock_schedule_algorithm=FCFS [mysqld.2] loose-innodb @@ -38,25 +32,15 @@ loose-innodb #galera_port=@OPT.port #ist_port=@OPT.port #sst_port=@OPT.port -wsrep-on=1 wsrep_cluster_address='gcomm://127.0.0.1:@mysqld.1.#galera_port' wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.2.#galera_port;evs.suspect_timeout=PT10S;evs.inactive_timeout=PT30S;evs.install_timeout=PT15S' - -# enforce read-committed characteristics across the cluster -wsrep_causal_reads=ON -wsrep_sync_wait = 15 - -wsrep_node_address=127.0.0.1 -wsrep_sst_receive_address=127.0.0.2:@mysqld.2.#sst_port +wsrep_node_address='127.0.0.1:@mysqld.2.#galera_port' wsrep_node_incoming_address=127.0.0.1:@mysqld.2.port -wsrep_sst_receive_address='127.0.0.2:@mysqld.2.#sst_port' +wsrep_sst_receive_address='127.0.0.1:@mysqld.2.#sst_port' # enforce read-committed characteristics across the cluster wsrep_causal_reads=ON wsrep_sync_wait = 15 -# lock schedule alg appears to be VATS by default, and it is not -# yet compatible with galera -innodb_lock_schedule_algorithm=FCFS [ENV] NODE_MYPORT_1= @mysqld.1.port |