database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MW-86 Adjust MTR tests for changes to wsrep_sync_wait

Browse Source
This commit is contained in:
Daniele Sciascia
2017-03-08 13:11:57 +01:00
committed by Jan Lindström
parent 7a219b6f23
commit f20b21a29a
38 changed files with 210 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/galera/galera_2nodes.cnf
View File

@@ -12,7 +12,7 @@ wsrep_provider_options='repl.causal_read_timeout=PT90S;base_port=@mysqld.1.#gale
# enforce read-committed characteristics across the cluster # enforce read-committed characteristics across the cluster
wsrep-causal-reads=ON wsrep-causal-reads=ON
wsrep-sync-wait=7 wsrep-sync-wait=15
[mysqld.1] [mysqld.1]
#galera_port=@OPT.port #galera_port=@OPT.port

4
mysql-test/suite/galera/galera_2nodes_as_master.cnf
View File

@@ -28,7 +28,7 @@ wsrep_node_address=127.0.0.1
wsrep_node_incoming_address=127.0.0.1:@mysqld.1.port wsrep_node_incoming_address=127.0.0.1:@mysqld.1.port
# enforce read-committed characteristics across the cluster # enforce read-committed characteristics across the cluster
wsrep-causal-reads=ON wsrep-causal-reads=ON
wsrep-sync-wait=7 wsrep-sync-wait=15
[mysqld.2] [mysqld.2]
#galera_port=@OPT.port #galera_port=@OPT.port
@@ -47,7 +47,7 @@ wsrep_node_address=127.0.0.1
wsrep_node_incoming_address=127.0.0.1:@mysqld.2.port wsrep_node_incoming_address=127.0.0.1:@mysqld.2.port
# enforce read-committed characteristics across the cluster # enforce read-committed characteristics across the cluster
wsrep-causal-reads=ON wsrep-causal-reads=ON
wsrep-sync-wait=7 wsrep-sync-wait=15
[mysqld.3] [mysqld.3]
server-id=3 server-id=3

4
mysql-test/suite/galera/galera_2nodes_as_master_slave.cnf
View File

@@ -29,7 +29,7 @@ wsrep_provider_options='base_port=@mysqld.2.#galera_port;evs.install_timeout = P
# enforce read-committed characteristics across the cluster # enforce read-committed characteristics across the cluster
wsrep_causal_reads=ON wsrep_causal_reads=ON
wsrep_sync_wait = 7 wsrep_sync_wait = 15
wsrep_node_address=127.0.0.1 wsrep_node_address=127.0.0.1
wsrep_sst_receive_address=127.0.0.2:@mysqld.2.#sst_port wsrep_sst_receive_address=127.0.0.2:@mysqld.2.#sst_port
@@ -49,7 +49,7 @@ wsrep_provider_options='base_port=@mysqld.3.#galera_port;evs.install_timeout = P
# enforce read-committed characteristics across the cluster # enforce read-committed characteristics across the cluster
wsrep_causal_reads=ON wsrep_causal_reads=ON
wsrep_sync_wait = 7 wsrep_sync_wait = 15
wsrep_node_address=127.0.0.1 wsrep_node_address=127.0.0.1
wsrep_sst_receive_address=127.0.0.2:@mysqld.3.#sst_port wsrep_sst_receive_address=127.0.0.2:@mysqld.3.#sst_port

4
mysql-test/suite/galera/galera_2nodes_as_master_with_repl_filter.cnf
View File

@@ -23,7 +23,7 @@ wsrep_provider_options='base_port=@mysqld.1.#galera_port'
# enforce read-committed characteristics across the cluster # enforce read-committed characteristics across the cluster
wsrep_causal_reads=ON wsrep_causal_reads=ON
wsrep_sync_wait = 7 wsrep_sync_wait = 15
wsrep_node_address=127.0.0.1 wsrep_node_address=127.0.0.1
wsrep_sst_receive_address=127.0.0.2:@mysqld.1.#sst_port wsrep_sst_receive_address=127.0.0.2:@mysqld.1.#sst_port
@@ -49,7 +49,7 @@ wsrep_provider_options='base_port=@mysqld.2.#galera_port'
# enforce read-committed characteristics across the cluster # enforce read-committed characteristics across the cluster
wsrep_causal_reads=ON wsrep_causal_reads=ON
wsrep_sync_wait = 7 wsrep_sync_wait = 15
wsrep_node_address=127.0.0.1 wsrep_node_address=127.0.0.1
wsrep_sst_receive_address=127.0.0.2:@mysqld.2.#sst_port wsrep_sst_receive_address=127.0.0.2:@mysqld.2.#sst_port

4
mysql-test/suite/galera/galera_2nodes_as_slave.cnf
View File

@@ -31,7 +31,7 @@ wsrep_sst_receive_address='127.0.0.1:@mysqld.2.#sst_port'
# enforce read-committed characteristics across the cluster # enforce read-committed characteristics across the cluster
wsrep-causal-reads=ON wsrep-causal-reads=ON
wsrep-sync-wait=7 wsrep-sync-wait=15
server-id=2 server-id=2
[mysqld.3] [mysqld.3]
@@ -53,7 +53,7 @@ wsrep_sst_receive_address='127.0.0.1:@mysqld.3.#sst_port'
# enforce read-committed characteristics across the cluster # enforce read-committed characteristics across the cluster
wsrep-causal-reads=ON wsrep-causal-reads=ON
wsrep-sync-wait=7 wsrep-sync-wait=15
server-id=3 server-id=3
[ENV] [ENV]

6
mysql-test/suite/galera/galera_3nodes_as_slave.cnf
View File

@@ -30,7 +30,7 @@ wsrep_sst_receive_address='127.0.0.1:@mysqld.2.#sst_port'
# enforce read-committed characteristics across the cluster # enforce read-committed characteristics across the cluster
wsrep-causal-reads=ON wsrep-causal-reads=ON
wsrep-sync-wait=7 wsrep-sync-wait=15
server-id=2 server-id=2
[mysqld.3] [mysqld.3]
@@ -51,7 +51,7 @@ wsrep_sst_receive_address='127.0.0.1:@mysqld.3.#sst_port'
# enforce read-committed characteristics across the cluster # enforce read-committed characteristics across the cluster
wsrep-causal-reads=ON wsrep-causal-reads=ON
wsrep-sync-wait=7 wsrep-sync-wait=15
server-id=3 server-id=3
[mysqld.4] [mysqld.4]
@@ -72,7 +72,7 @@ wsrep_sst_receive_address='127.0.0.1:@mysqld.4.#sst_port'
# enforce read-committed characteristics across the cluster # enforce read-committed characteristics across the cluster
wsrep-causal-reads=ON wsrep-causal-reads=ON
wsrep-sync-wait=7 wsrep-sync-wait=15
server-id=4 server-id=4
[ENV] [ENV]

2
mysql-test/suite/galera/galera_4nodes.cnf
View File

@@ -9,7 +9,7 @@ wsrep-provider=@ENV.WSREP_PROVIDER
wsrep_node_address=127.0.0.1 wsrep_node_address=127.0.0.1
# enforce read-committed characteristics across the cluster # enforce read-committed characteristics across the cluster
wsrep-causal-reads=ON wsrep-causal-reads=ON
wsrep-sync-wait=7 wsrep-sync-wait=15
[mysqld.1] [mysqld.1]
#galera_port=@OPT.port #galera_port=@OPT.port

2
mysql-test/suite/galera/r/GAL-401.result
View File

@@ -9,7 +9,7 @@ SHOW STATUS LIKE 'wsrep_desync_count';
Variable_name Value Variable_name Value
wsrep_desync_count 0 wsrep_desync_count 0
SET @@global.wsrep_desync = 0; SET @@global.wsrep_desync = 0;
SET SESSION wsrep_sync_wait=7; SET SESSION wsrep_sync_wait=15;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (

2
mysql-test/suite/galera/r/galera_applier_ftwrl_table.result
View File

@@ -8,7 +8,7 @@ SELECT COUNT(*) = 0 FROM t1;
COUNT(*) = 0 COUNT(*) = 0
1 1
UNLOCK TABLES; UNLOCK TABLES;
SET SESSION wsrep_sync_wait = 7; SET SESSION wsrep_sync_wait = 15;
SELECT COUNT(*) = 2 FROM t1; SELECT COUNT(*) = 2 FROM t1;
COUNT(*) = 2 COUNT(*) = 2
1 1

2
mysql-test/suite/galera/r/galera_applier_ftwrl_table_alter.result
View File

@@ -12,7 +12,7 @@ SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system use
COUNT(*) = 1 COUNT(*) = 1
1 1
UNLOCK TABLES; UNLOCK TABLES;
SET SESSION wsrep_sync_wait = 7; SET SESSION wsrep_sync_wait = 15;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
Table Create Table Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (

2
mysql-test/suite/galera/r/galera_bf_abort_flush_for_export.result
View File

@@ -6,7 +6,7 @@ SET SESSION wsrep_sync_wait = 0;
UNLOCK TABLES; UNLOCK TABLES;
COMMIT; COMMIT;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
SET SESSION wsrep_sync_wait = 7; SET SESSION wsrep_sync_wait = 15;
SELECT COUNT(*) = 1 FROM t1; SELECT COUNT(*) = 1 FROM t1;
COUNT(*) = 1 COUNT(*) = 1
1 1

2
mysql-test/suite/galera/r/galera_defaults.result
View File

@@ -47,7 +47,7 @@ WSREP_SST_AUTH
WSREP_SST_DONOR WSREP_SST_DONOR
WSREP_SST_DONOR_REJECTS_QUERIES OFF WSREP_SST_DONOR_REJECTS_QUERIES OFF
WSREP_SST_METHOD rsync WSREP_SST_METHOD rsync
WSREP_SYNC_WAIT 7 WSREP_SYNC_WAIT 15
<BASE_DIR>; <BASE_HOST>; <BASE_PORT>; cert.log_conflicts = no; debug = no; evs.auto_evict = 0; evs.causal_keepalive_period = PT1S; evs.debug_log_mask = 0x1; evs.delay_margin = PT1S; evs.delayed_keep_period = PT30S; evs.inactive_check_period = PT0.5S; evs.inactive_timeout = PT15S; evs.info_log_mask = 0; evs.install_timeout = PT7.5S; evs.join_retrans_period = PT1S; evs.keepalive_period = PT1S; evs.max_install_timeouts = 3; evs.send_window = 4; evs.stats_report_period = PT1M; evs.suspect_timeout = PT10S; evs.use_aggregate = true; evs.user_send_window = 2; evs.version = 0; evs.view_forget_timeout = P1D; <GCACHE_DIR>; gcache.keep_pages_size = 0; gcache.mem_size = 0; <GCACHE_NAME>; gcache.page_size = 128M; gcache.recover = no; gcache.size = 10M; gcomm.thread_prio = ; gcs.fc_debug = 0; gcs.fc_factor = 1.0; gcs.fc_limit = 16; gcs.fc_master_slave = no; gcs.max_packet_size = 64500; gcs.max_throttle = 0.25; <GCS_RECV_Q_HARD_LIMIT>; gcs.recv_q_soft_limit = 0.25; gcs.sync_donor = no; <GMCAST_LISTEN_ADDR>; gmcast.mcast_addr = ; gmcast.mcast_ttl = 1; gmcast.peer_timeout = PT3S; gmcast.segment = 0; gmcast.time_wait = PT5S; gmcast.version = 0; <IST_RECV_ADDR>; pc.announce_timeout = PT3S; pc.checksum = false; pc.ignore_quorum = false; pc.ignore_sb = false; pc.linger = PT20S; pc.npvo = false; pc.recovery = true; pc.version = 0; pc.wait_prim = true; pc.wait_prim_timeout = PT30S; pc.weight = 1; protonet.backend = asio; protonet.version = 0; repl.causal_read_timeout = PT90S; repl.commit_order = 3; repl.key_format = FLAT8; repl.max_ws_size = 2147483647; repl.proto_max = 7; socket.checksum = 2; socket.recv_buf_size = 212992; <BASE_DIR>; <BASE_HOST>; <BASE_PORT>; cert.log_conflicts = no; debug = no; evs.auto_evict = 0; evs.causal_keepalive_period = PT1S; evs.debug_log_mask = 0x1; evs.delay_margin = PT1S; evs.delayed_keep_period = PT30S; evs.inactive_check_period = PT0.5S; evs.inactive_timeout = PT15S; evs.info_log_mask = 0; evs.install_timeout = PT7.5S; evs.join_retrans_period = PT1S; evs.keepalive_period = PT1S; evs.max_install_timeouts = 3; evs.send_window = 4; evs.stats_report_period = PT1M; evs.suspect_timeout = PT10S; evs.use_aggregate = true; evs.user_send_window = 2; evs.version = 0; evs.view_forget_timeout = P1D; <GCACHE_DIR>; gcache.keep_pages_size = 0; gcache.mem_size = 0; <GCACHE_NAME>; gcache.page_size = 128M; gcache.recover = no; gcache.size = 10M; gcomm.thread_prio = ; gcs.fc_debug = 0; gcs.fc_factor = 1.0; gcs.fc_limit = 16; gcs.fc_master_slave = no; gcs.max_packet_size = 64500; gcs.max_throttle = 0.25; <GCS_RECV_Q_HARD_LIMIT>; gcs.recv_q_soft_limit = 0.25; gcs.sync_donor = no; <GMCAST_LISTEN_ADDR>; gmcast.mcast_addr = ; gmcast.mcast_ttl = 1; gmcast.peer_timeout = PT3S; gmcast.segment = 0; gmcast.time_wait = PT5S; gmcast.version = 0; <IST_RECV_ADDR>; pc.announce_timeout = PT3S; pc.checksum = false; pc.ignore_quorum = false; pc.ignore_sb = false; pc.linger = PT20S; pc.npvo = false; pc.recovery = true; pc.version = 0; pc.wait_prim = true; pc.wait_prim_timeout = PT30S; pc.weight = 1; protonet.backend = asio; protonet.version = 0; repl.causal_read_timeout = PT90S; repl.commit_order = 3; repl.key_format = FLAT8; repl.max_ws_size = 2147483647; repl.proto_max = 7; socket.checksum = 2; socket.recv_buf_size = 212992;
SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_STATUS SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_STATUS
WHERE VARIABLE_NAME LIKE 'wsrep_%' WHERE VARIABLE_NAME LIKE 'wsrep_%'

4
mysql-test/suite/galera/r/galera_insert_ignore.result
View File

@@ -1,5 +1,5 @@
SET GLOBAL wsrep_sync_wait = 7; SET GLOBAL wsrep_sync_wait = 15;
SET GLOBAL wsrep_sync_wait = 7; SET GLOBAL wsrep_sync_wait = 15;
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB; CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
INSERT INTO t1 VALUES (1); INSERT INTO t1 VALUES (1);
INSERT IGNORE INTO t1 VALUES (1), (2); INSERT IGNORE INTO t1 VALUES (1), (2);

2
mysql-test/suite/galera/r/galera_many_rows.result
View File

@@ -5,7 +5,7 @@ INSERT INTO ten VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
CREATE TABLE t1 (f1 INTEGER AUTO_INCREMENT PRIMARY KEY, f2 INTEGER) Engine=InnoDB; CREATE TABLE t1 (f1 INTEGER AUTO_INCREMENT PRIMARY KEY, f2 INTEGER) Engine=InnoDB;
INSERT INTO t1 (f2) SELECT a1.f1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5; INSERT INTO t1 (f2) SELECT a1.f1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4, ten AS a5;
SET SESSION wsrep_sync_wait = 0; SET SESSION wsrep_sync_wait = 0;
SET SESSION wsrep_sync_wait = 7; SET SESSION wsrep_sync_wait = 15;
SET GLOBAL wsrep_provider_options = 'repl.causal_read_timeout=PT1H'; SET GLOBAL wsrep_provider_options = 'repl.causal_read_timeout=PT1H';
SELECT COUNT(*) = 100000 FROM t1; SELECT COUNT(*) = 100000 FROM t1;
COUNT(*) = 100000 COUNT(*) = 100000

2
mysql-test/suite/galera/r/galera_parallel_apply_lock_table.result
View File

@@ -18,7 +18,7 @@ SELECT COUNT(*) = 0 FROM t2;
COUNT(*) = 0 COUNT(*) = 0
1 1
UNLOCK TABLES; UNLOCK TABLES;
SET SESSION wsrep_sync_wait = 7;; SET SESSION wsrep_sync_wait = 15;;
SELECT COUNT(*) = 1 FROM t1; SELECT COUNT(*) = 1 FROM t1;
COUNT(*) = 1 COUNT(*) = 1
1 1

2
mysql-test/suite/galera/r/galera_parallel_simple.result
View File

@@ -16,7 +16,7 @@ INSERT INTO t1 VALUES (1);
INSERT INTO t2 VALUES (1); INSERT INTO t2 VALUES (1);
SET SESSION wsrep_sync_wait = 0; SET SESSION wsrep_sync_wait = 0;
UNLOCK TABLES; UNLOCK TABLES;
SET SESSION wsrep_sync_wait = 7; SET SESSION wsrep_sync_wait = 15;
SELECT COUNT(*) = 10 FROM t1; SELECT COUNT(*) = 10 FROM t1;
COUNT(*) = 10 COUNT(*) = 10
0 0

5
mysql-test/suite/galera/r/galera_query_cache_sync_wait.result
View File

@@ -4,7 +4,6 @@ SET GLOBAL wsrep_provider_options = "repl.causal_read_timeout=PT1S";
SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb"; SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
Warnings: Warnings:
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
SET SESSION wsrep_sync_wait = 7;
SELECT MAX(id) FROM t1; SELECT MAX(id) FROM t1;
MAX(id) MAX(id)
1 1
@@ -16,7 +15,6 @@ Warnings:
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
FLUSH QUERY CACHE; FLUSH QUERY CACHE;
SET SESSION wsrep_sync_wait = 7;
SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb"; SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
Warnings: Warnings:
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
@@ -29,11 +27,9 @@ Warnings:
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
INSERT INTO t1 VALUES (4); INSERT INTO t1 VALUES (4);
SET SESSION wsrep_sync_wait = 7;
SELECT MAX(id) FROM t1; SELECT MAX(id) FROM t1;
MAX(id) MAX(id)
4 4
SET SESSION wsrep_sync_wait = 7;
FLUSH STATUS; FLUSH STATUS;
SELECT MAX(id) FROM t1; SELECT MAX(id) FROM t1;
MAX(id) MAX(id)
@@ -45,7 +41,6 @@ SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
Warnings: Warnings:
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
INSERT INTO t1 VALUES (5); INSERT INTO t1 VALUES (5);
SET SESSION wsrep_sync_wait = 7;
SELECT MAX(id) FROM t1 ; SELECT MAX(id) FROM t1 ;
SET GLOBAL DEBUG = ""; SET GLOBAL DEBUG = "";
Warnings: Warnings:

2
mysql-test/suite/galera/r/galera_sync_wait_show.result
View File

@@ -1,4 +1,4 @@
SET SESSION wsrep_sync_wait = 1; SET SESSION wsrep_sync_wait = 8;
CREATE DATABASE db1; CREATE DATABASE db1;
SHOW CREATE DATABASE db1; SHOW CREATE DATABASE db1;
Database Create Database Database Create Database

4
mysql-test/suite/galera/r/galera_unicode_identifiers.result
View File

@@ -1,5 +1,5 @@
SET GLOBAL wsrep_sync_wait = 7; SET GLOBAL wsrep_sync_wait = 15;
SET GLOBAL wsrep_sync_wait = 7; SET GLOBAL wsrep_sync_wait = 15;
CREATE DATABASE `database with space`; CREATE DATABASE `database with space`;
USE `database with space`; USE `database with space`;
CREATE TABLE `table with space` ( CREATE TABLE `table with space` (

5
mysql-test/suite/galera/r/galera_var_sync_wait.result
View File

@@ -1,8 +1,5 @@
CREATE TABLE t1 (f1 INT PRIMARY KEY) Engine=InnoDB; CREATE TABLE t1 (f1 INT PRIMARY KEY) Engine=InnoDB;
SET GLOBAL wsrep_sync_wait = 1; SET GLOBAL wsrep_sync_wait = 1;
SHOW TABLES LIKE '%t1';
Tables_in_test (%t1)
t1
SELECT COUNT(*) = 0 FROM t1; SELECT COUNT(*) = 0 FROM t1;
COUNT(*) = 0 COUNT(*) = 0
1 1
@@ -15,7 +12,7 @@ SET GLOBAL wsrep_sync_wait = 2;
UPDATE t3 SET f1 = 2; UPDATE t3 SET f1 = 2;
affected rows: 1 affected rows: 1
info: Rows matched: 1 Changed: 1 Warnings: 0 info: Rows matched: 1 Changed: 1 Warnings: 0
SET GLOBAL wsrep_sync_wait = 7; SET GLOBAL wsrep_sync_wait = 15;
DROP TABLE t1; DROP TABLE t1;
DROP TABLE t2; DROP TABLE t2;
DROP TABLE t3; DROP TABLE t3;

1
mysql-test/suite/galera/r/mysql-wsrep#201.result
View File

@@ -1,4 +1,3 @@
CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB; CREATE TABLE t1 (id INT PRIMARY KEY AUTO_INCREMENT) ENGINE=InnoDB;
INSERT INTO t1 VALUES (DEFAULT); INSERT INTO t1 VALUES (DEFAULT);
SET GLOBAL query_cache_size=1355776; SET GLOBAL query_cache_size=1355776;
SET SESSION wsrep_sync_wait = 7;

2
mysql-test/suite/galera/t/GAL-401.test
View File

@@ -44,7 +44,7 @@ SET @@global.wsrep_desync = 0;
--let $wait_condition = SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment'; --let $wait_condition = SELECT VARIABLE_VALUE = 'Synced' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_state_comment';
--source include/wait_condition.inc --source include/wait_condition.inc
SET SESSION wsrep_sync_wait=7; SET SESSION wsrep_sync_wait=15;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
DROP TABLE t1; DROP TABLE t1;
CALL mtr.add_suppression("WSREP: Protocol violation. JOIN message sender (.*) is not in state transfer \\(SYNCED\\). Message ignored."); CALL mtr.add_suppression("WSREP: Protocol violation. JOIN message sender (.*) is not in state transfer \\(SYNCED\\). Message ignored.");

2
mysql-test/suite/galera/t/galera_applier_ftwrl_table.test
View File

@@ -28,7 +28,7 @@ SELECT COUNT(*) = 0 FROM t1;
--connection node_1 --connection node_1
UNLOCK TABLES; UNLOCK TABLES;
SET SESSION wsrep_sync_wait = 7; SET SESSION wsrep_sync_wait = 15;
SELECT COUNT(*) = 2 FROM t1; SELECT COUNT(*) = 2 FROM t1;
DROP TABLE t1; DROP TABLE t1;

2
mysql-test/suite/galera/t/galera_applier_ftwrl_table_alter.test
View File

@@ -29,7 +29,7 @@ SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system use
UNLOCK TABLES; UNLOCK TABLES;
SET SESSION wsrep_sync_wait = 7; SET SESSION wsrep_sync_wait = 15;
SHOW CREATE TABLE t1; SHOW CREATE TABLE t1;
SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock'; SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE = 'Waiting for table metadata lock';

2
mysql-test/suite/galera/t/galera_bf_abort_flush_for_export.test
View File

@@ -27,7 +27,7 @@ UNLOCK TABLES;
COMMIT; COMMIT;
SET AUTOCOMMIT=ON; SET AUTOCOMMIT=ON;
SET SESSION wsrep_sync_wait = 7; SET SESSION wsrep_sync_wait = 15;
SELECT COUNT(*) = 1 FROM t1; SELECT COUNT(*) = 1 FROM t1;
--let $wsrep_local_bf_aborts_after = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_bf_aborts'` --let $wsrep_local_bf_aborts_after = `SELECT VARIABLE_VALUE FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_local_bf_aborts'`

4
mysql-test/suite/galera/t/galera_insert_ignore.test
View File

@@ -2,10 +2,10 @@
--source include/have_innodb.inc --source include/have_innodb.inc
--let $wsrep_sync_wait_orig = (SELECT @@wsrep_sync_wait) --let $wsrep_sync_wait_orig = (SELECT @@wsrep_sync_wait)
SET GLOBAL wsrep_sync_wait = 7; SET GLOBAL wsrep_sync_wait = 15;
--connection node_2 --connection node_2
SET GLOBAL wsrep_sync_wait = 7; SET GLOBAL wsrep_sync_wait = 15;
# #

2
mysql-test/suite/galera/t/galera_many_rows.test
View File

@@ -16,7 +16,7 @@ INSERT INTO t1 (f2) SELECT a1.f1 FROM ten AS a1, ten AS a2, ten AS a3, ten AS a4
--connection node_2 --connection node_2
SET SESSION wsrep_sync_wait = 0; SET SESSION wsrep_sync_wait = 0;
--let $wsrep_provider_options_node2 = `SELECT @@wsrep_provider_options` --let $wsrep_provider_options_node2 = `SELECT @@wsrep_provider_options`
SET SESSION wsrep_sync_wait = 7; SET SESSION wsrep_sync_wait = 15;
SET GLOBAL wsrep_provider_options = 'repl.causal_read_timeout=PT1H'; SET GLOBAL wsrep_provider_options = 'repl.causal_read_timeout=PT1H';

2
mysql-test/suite/galera/t/galera_migrate.cnf
View File

@@ -13,7 +13,7 @@ log-bin=mysqld-bin
wsrep_node_address=127.0.0.1 wsrep_node_address=127.0.0.1
wsrep_causal_reads=ON wsrep_causal_reads=ON
wsrep_sync_wait = 7 wsrep_sync_wait = 15
[mysqld.1] [mysqld.1]
#galera_port=@OPT.port #galera_port=@OPT.port

2
mysql-test/suite/galera/t/galera_parallel_simple.test
View File

@@ -45,7 +45,7 @@ SET SESSION wsrep_sync_wait = 0;
UNLOCK TABLES; UNLOCK TABLES;
SET SESSION wsrep_sync_wait = 7; SET SESSION wsrep_sync_wait = 15;
SELECT COUNT(*) = 10 FROM t1; SELECT COUNT(*) = 10 FROM t1;
SELECT COUNT(*) = 10 FROM t2; SELECT COUNT(*) = 10 FROM t2;

5
mysql-test/suite/galera/t/galera_query_cache_sync_wait.test
View File

@@ -10,7 +10,6 @@ INSERT INTO t1 VALUES (1);
--let $wsrep_provider_options_orig = `SELECT @@wsrep_provider_options` --let $wsrep_provider_options_orig = `SELECT @@wsrep_provider_options`
SET GLOBAL wsrep_provider_options = "repl.causal_read_timeout=PT1S"; SET GLOBAL wsrep_provider_options = "repl.causal_read_timeout=PT1S";
SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb"; SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
SET SESSION wsrep_sync_wait = 7;
SELECT MAX(id) FROM t1; # first lookup miss SELECT MAX(id) FROM t1; # first lookup miss
# #
@@ -27,7 +26,6 @@ SET GLOBAL DEBUG = "";
SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb"; SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
FLUSH QUERY CACHE; FLUSH QUERY CACHE;
SET SESSION wsrep_sync_wait = 7;
SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb"; SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
SET DEBUG_SYNC = "RESET"; SET DEBUG_SYNC = "RESET";
@@ -52,9 +50,7 @@ SET DEBUG_SYNC = "now SIGNAL signal.wsrep_apply_cb";
INSERT INTO t1 VALUES (4); INSERT INTO t1 VALUES (4);
--connection node_2 --connection node_2
SET SESSION wsrep_sync_wait = 7;
SELECT MAX(id) FROM t1; SELECT MAX(id) FROM t1;
SET SESSION wsrep_sync_wait = 7;
# #
# Query cache hit # Query cache hit
@@ -73,7 +69,6 @@ SET GLOBAL DEBUG = "d,sync.wsrep_apply_cb";
INSERT INTO t1 VALUES (5); INSERT INTO t1 VALUES (5);
--connection node_2 --connection node_2
SET SESSION wsrep_sync_wait = 7;
--send SELECT MAX(id) FROM t1 --send SELECT MAX(id) FROM t1
--connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2 --connect node_2a, 127.0.0.1, root, , test, $NODE_MYPORT_2

3
mysql-test/suite/galera/t/galera_sync_wait_show.test
View File

@@ -7,7 +7,8 @@
--source include/have_debug.inc --source include/have_debug.inc
--connection node_2 --connection node_2
SET SESSION wsrep_sync_wait = 1; # MW-86 SHOW commands have now bitmap value 8
SET SESSION wsrep_sync_wait = 8;
--connection node_1 --connection node_1

4
mysql-test/suite/galera/t/galera_unicode_identifiers.test
View File

@@ -6,10 +6,10 @@
--source include/have_innodb.inc --source include/have_innodb.inc
--let $wsrep_sync_wait_orig = (SELECT @@wsrep_sync_wait) --let $wsrep_sync_wait_orig = (SELECT @@wsrep_sync_wait)
SET GLOBAL wsrep_sync_wait = 7; SET GLOBAL wsrep_sync_wait = 15;
--connection node_2 --connection node_2
SET GLOBAL wsrep_sync_wait = 7; SET GLOBAL wsrep_sync_wait = 15;
--connection node_1 --connection node_1

5
mysql-test/suite/galera/t/galera_var_sync_wait.test
View File

@@ -13,7 +13,10 @@ CREATE TABLE t1 (f1 INT PRIMARY KEY) Engine=InnoDB;
--connection node_2 --connection node_2
SET GLOBAL wsrep_sync_wait = 1; SET GLOBAL wsrep_sync_wait = 1;
# Those statements should see the table # Those statements should see the table
SHOW TABLES LIKE '%t1';
# MW-86 SHOW commands have now their own bitmask
# SHOW TABLES LIKE '%t1';
SELECT COUNT(*) = 0 FROM t1; SELECT COUNT(*) = 0 FROM t1;
--connection node_1 --connection node_1

1
mysql-test/suite/galera/t/mysql-wsrep#201.test
View File

@@ -8,7 +8,6 @@ INSERT INTO t1 VALUES (DEFAULT);
--connection node_2 --connection node_2
--let $qcache_size_orig = `SELECT @@GLOBAL.query_cache_size` --let $qcache_size_orig = `SELECT @@GLOBAL.query_cache_size`
SET GLOBAL query_cache_size=1355776; SET GLOBAL query_cache_size=1355776;
SET SESSION wsrep_sync_wait = 7;
--disable_query_log --disable_query_log

2
mysql-test/suite/galera_3nodes/galera_3nodes.cnf
View File

@@ -9,7 +9,7 @@ wsrep-provider=@ENV.WSREP_PROVIDER
wsrep_node_address=127.0.0.1 wsrep_node_address=127.0.0.1
# enforce read-committed characteristics across the cluster # enforce read-committed characteristics across the cluster
wsrep-causal-reads=ON wsrep-causal-reads=ON
wsrep-sync-wait=7 wsrep-sync-wait=15
[mysqld.1] [mysqld.1]
wsrep-cluster-address='gcomm://' wsrep-cluster-address='gcomm://'

48
mysql-test/suite/galera_3nodes/r/galera_var_dirty_reads2.result Normal file
View File

@@ -0,0 +1,48 @@
CREATE TABLE t1 (f1 INTEGER);
INSERT INTO t1 VALUES (1);
SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
SET SESSION wsrep_sync_wait = 0;
SET SESSION wsrep_dirty_reads = 1;
SELECT f1 FROM t1;
f1
1
USE test;
SHOW CREATE TABLE t1;
Table Create Table
t1 CREATE TABLE `t1` (
`f1` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
LOCK TABLE t1 WRITE;
UNLOCK TABLES;
FLUSH TABLES WITH READ LOCK;
UNLOCK TABLES;
PREPARE stmt_select FROM 'SELECT f1 FROM t1';
EXECUTE stmt_select;
f1
1
PREPARE stmt_update FROM 'UPDATE t1 SET f1 = f1 + f1';
SET GLOBAL wsrep_dirty_reads = 1;
SET GLOBAL wsrep_sync_wait = 0;
SET GLOBAL wsrep_dirty_reads = 0;
SET GLOBAL wsrep_sync_wait = 15;
SET SESSION wsrep_dirty_reads = 1;
INSERT INTO t1 SELECT * FROM t1;
ERROR 08S01: WSREP has not yet prepared node for application use
DELETE FROM t1;
ERROR 08S01: WSREP has not yet prepared node for application use
UPDATE t1 SET f1 = f1 + 1;
ERROR 08S01: WSREP has not yet prepared node for application use
DROP TABLE t1;
ERROR 08S01: WSREP has not yet prepared node for application use
EXECUTE stmt_update;
ERROR 08S01: WSREP has not yet prepared node for application use
SET SESSION wsrep_dirty_reads = 0;
SELECT * FROM t1;
ERROR 08S01: WSREP has not yet prepared node for application use
EXECUTE stmt_select;
ERROR 08S01: WSREP has not yet prepared node for application use
SELECT COUNT(*) > 0 FROM INFORMATION_SCHEMA.PROCESSLIST;
COUNT(*) > 0
1
SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
DROP TABLE t1;

112
mysql-test/suite/galera_3nodes/t/galera_var_dirty_reads2.test Normal file
View File

@@ -0,0 +1,112 @@
#
# Additional tests for wsrep_dirty_reads
#
--source include/galera_cluster.inc
--source include/have_innodb.inc
CREATE TABLE t1 (f1 INTEGER);
INSERT INTO t1 VALUES (1);
--connection node_2
SET GLOBAL wsrep_provider_options='gmcast.isolate=1';
--connection node_1
--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
--source include/wait_condition.inc
--connection node_2
SET SESSION wsrep_sync_wait = 0;
--let $wait_condition = SELECT VARIABLE_VALUE = 'non-Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
--source include/wait_condition.inc
SET SESSION wsrep_dirty_reads = 1;
# Those statements should succeed
--error 0
SELECT f1 FROM t1;
--error 0
USE test;
--error 0
SHOW CREATE TABLE t1;
--error 0
LOCK TABLE t1 WRITE;
--error 0
UNLOCK TABLES;
--error 0
FLUSH TABLES WITH READ LOCK;
--error 0
UNLOCK TABLES;
--error 0
PREPARE stmt_select FROM 'SELECT f1 FROM t1';
--error 0
EXECUTE stmt_select;
--error 0
PREPARE stmt_update FROM 'UPDATE t1 SET f1 = f1 + f1';
# Mysqldump should succeed
SET GLOBAL wsrep_dirty_reads = 1;
SET GLOBAL wsrep_sync_wait = 0;
--error 0
--exec $MYSQL_DUMP -u root -S $NODE_MYSOCK_2 test >/dev/null
SET GLOBAL wsrep_dirty_reads = 0;
SET GLOBAL wsrep_sync_wait = 15;
# Those statements should fail
SET SESSION wsrep_dirty_reads = 1;
--error ER_UNKNOWN_COM_ERROR
INSERT INTO t1 SELECT * FROM t1;
--error ER_UNKNOWN_COM_ERROR
DELETE FROM t1;
--error ER_UNKNOWN_COM_ERROR
UPDATE t1 SET f1 = f1 + 1;
--error ER_UNKNOWN_COM_ERROR
DROP TABLE t1;
--error ER_UNKNOWN_COM_ERROR
EXECUTE stmt_update;
# With wsrep_dirty_reads = 0 , even SELECTS are not allowed
SET SESSION wsrep_dirty_reads = 0;
--error ER_UNKNOWN_COM_ERROR
SELECT * FROM t1;
--error ER_UNKNOWN_COM_ERROR
EXECUTE stmt_select;
# But reads from INFORMATION_SCHEMA are allowed
--error 0
SELECT COUNT(*) > 0 FROM INFORMATION_SCHEMA.PROCESSLIST;
# Restore cluster
SET GLOBAL wsrep_provider_options='gmcast.isolate=0';
--connection node_1
--let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
--source include/wait_condition.inc
--connection node_2
--let $wait_condition = SELECT VARIABLE_VALUE = 'Primary' FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_status';
--source include/wait_condition.inc
DROP TABLE t1;

6
sql/wsrep_mysqld.cc
View File

@@ -970,9 +970,13 @@ static bool wsrep_prepare_keys_for_isolation(THD* thd,
for (const TABLE_LIST* table= table_list; table; table= table->next_global) for (const TABLE_LIST* table= table_list; table; table= table->next_global)
{ {
wsrep_key_t* tmp; wsrep_key_t* tmp;
tmp= (wsrep_key_t*)my_realloc(ka->keys, if (ka->keys)
tmp= (wsrep_key_t*)my_realloc(ka->keys,
(ka->keys_len + 1) * sizeof(wsrep_key_t), (ka->keys_len + 1) * sizeof(wsrep_key_t),
MYF(0)); MYF(0));
else
tmp= (wsrep_key_t*)my_malloc((ka->keys_len + 1) * sizeof(wsrep_key_t), MYF(0));
if (!tmp) if (!tmp)
{ {
WSREP_ERROR("Can't allocate memory for key_array"); WSREP_ERROR("Can't allocate memory for key_array");