revision-id: fde7d61d0a716a35a3065d0bfcb4a830e7106c85 (mariadb-10.2.22-48-gfde7d61d0a7) parent(s): cdb2dc82c181c8257016de1cba9c5563bc32986f author: Jan Lindström committer: Jan Lindström timestamp: 2019-03-10 17:15:27 +0200 message: Test fixes. --- mysql-test/suite/galera/r/galera_kill_smallchanges.result | 2 +- mysql-test/suite/galera/t/galera_kill_smallchanges.test | 4 ++-- mysql-test/suite/galera/t/galera_var_slave_threads.test | 12 +++++++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/mysql-test/suite/galera/r/galera_kill_smallchanges.result b/mysql-test/suite/galera/r/galera_kill_smallchanges.result index 07d1d12ef9e..e4d7161c71a 100644 --- a/mysql-test/suite/galera/r/galera_kill_smallchanges.result +++ b/mysql-test/suite/galera/r/galera_kill_smallchanges.result @@ -1,6 +1,5 @@ connection node_1; connection node_2; -call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*"); connection node_1; SET GLOBAL wsrep_provider_options = 'pc.ignore_sb=true'; CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; @@ -10,6 +9,7 @@ connection node_1; INSERT INTO t1 VALUES (1); connection node_2; connection node_2a; +call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*"); SELECT COUNT(*) = 1 FROM t1; COUNT(*) = 1 1 diff --git a/mysql-test/suite/galera/t/galera_kill_smallchanges.test b/mysql-test/suite/galera/t/galera_kill_smallchanges.test index 07c9dd52b3e..3f39478fcd5 100644 --- a/mysql-test/suite/galera/t/galera_kill_smallchanges.test +++ b/mysql-test/suite/galera/t/galera_kill_smallchanges.test @@ -9,8 +9,6 @@ --let $node_2=node_2 --source include/auto_increment_offset_save.inc -call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*"); - --connection node_1 # Enable the master to continue running during the split-brain situation that @@ -34,6 +32,8 @@ INSERT INTO t1 VALUES (1); --source include/galera_connect.inc --connection node_2a +call mtr.add_suppression("WSREP: Last Applied Action message in non-primary configuration from member .*"); + SELECT COUNT(*) = 1 FROM t1; SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; diff --git a/mysql-test/suite/galera/t/galera_var_slave_threads.test b/mysql-test/suite/galera/t/galera_var_slave_threads.test index 80edcb2aff9..be612bb74e9 100644 --- a/mysql-test/suite/galera/t/galera_var_slave_threads.test +++ b/mysql-test/suite/galera/t/galera_var_slave_threads.test @@ -19,6 +19,7 @@ SET GLOBAL wsrep_slave_threads = 0; SHOW WARNINGS; SELECT @@wsrep_slave_threads = 1; +--echo # wsrep_slave_threads = 1 SET GLOBAL wsrep_slave_threads = 1; # There is a separate wsrep_aborter thread at all times SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%'; @@ -37,8 +38,9 @@ INSERT INTO t1 VALUES (1); --let $wait_condition = SELECT COUNT(*) = 1 FROM t1; --source include/wait_condition.inc -SELECT COUNT(*) = 1 FROM t1; +SELECT COUNT(*) FROM t1; +--echo # wsrep_slave_threads = 64 --let $wait_condition = SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE IS NULL OR STATE NOT LIKE 'InnoDB%'); --source include/wait_condition.inc @@ -53,7 +55,7 @@ SET GLOBAL wsrep_slave_threads = 1; --disable_result_log --disable_query_log # Generate 64 replication events ---let $count = 64 +--let $count = 66 while ($count) { INSERT INTO t2 VALUES (DEFAULT); @@ -65,11 +67,11 @@ while ($count) --connection node_2 SELECT COUNT(*) FROM t2; +--echo # wsrep_slave_threads = 1 --let $wait_condition = SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE IS NULL OR STATE NOT LIKE 'InnoDB%') --source include/wait_condition.inc SELECT COUNT(*) FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND STATE LIKE '%wsrep aborter%'; - --eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_threads_orig DROP TABLE t1; @@ -84,6 +86,7 @@ CREATE TABLE t1 (i INT AUTO_INCREMENT PRIMARY KEY) ENGINE=INNODB; --connection node_2 SET GLOBAL wsrep_slave_threads = 4; +--echo # wsrep_slave_threads = 4 --let $wait_condition = SELECT COUNT(*) = @@wsrep_slave_threads + 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE USER = 'system user' AND (STATE IS NULL OR STATE NOT LIKE 'InnoDB%') --source include/wait_condition.inc @@ -93,6 +96,9 @@ SET GLOBAL wsrep_slave_threads = 1; INSERT INTO t1 VALUES (DEFAULT); INSERT INTO t1 VALUES (DEFAULT); INSERT INTO t1 VALUES (DEFAULT); +INSERT INTO t1 VALUES (DEFAULT); +INSERT INTO t1 VALUES (DEFAULT); +INSERT INTO t1 VALUES (DEFAULT); DROP TABLE t1; --connection node_2