[Commits] 14e113b91a5: Adjust wsrep, galera, galera_3nodes, galera_sr and galera_3nodes_sr tests
revision-id: 14e113b91a58b80062ca8a4c43d918031b0e4cd0 (mariadb-10.4.3-133-g14e113b91a5) parent(s): 79fe17567a71467116214fc8fad925681c4c87da author: Jan Lindström committer: Jan Lindström timestamp: 2019-04-02 15:43:46 +0300 message: Adjust wsrep, galera, galera_3nodes, galera_sr and galera_3nodes_sr tests after commit b5615eff0d00cfb4c60b9d1bf67094da7c2258a6 --- mysql-test/suite/galera_3nodes/t/galera_garbd.test | 1 + mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test | 1 + mysql-test/suite/galera_3nodes/t/galera_safe_to_bootstrap.test | 5 ++++- mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test | 1 + mysql-test/suite/galera_3nodes_sr/r/GCF-832.result | 1 + mysql-test/suite/galera_3nodes_sr/r/galera_sr_join_slave.result | 1 + mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_master.result | 1 + .../suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply.result | 1 + .../r/galera_sr_kill_slave_after_apply_rollback.result | 1 + .../galera_3nodes_sr/r/galera_sr_kill_slave_before_apply.result | 1 + mysql-test/suite/galera_sr/r/galera_sr_kill_all_nobootstrap.result | 2 ++ mysql-test/suite/galera_sr/r/galera_sr_kill_all_norecovery.result | 2 ++ mysql-test/suite/galera_sr/r/galera_sr_kill_all_pcrecovery.result | 2 ++ mysql-test/suite/galera_sr/r/galera_sr_kill_slave.result | 1 + mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result | 1 + mysql-test/suite/galera_sr/r/galera_sr_shutdown_master.result | 1 + mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result | 1 + mysql-test/suite/galera_sr/r/mysql-wsrep-features#9.result | 1 + mysql-test/suite/wsrep/t/wsrep-recover-v25.test | 5 +++++ mysql-test/suite/wsrep/t/wsrep-recover.test | 5 +++++ 20 files changed, 34 insertions(+), 1 deletion(-) diff --git a/mysql-test/suite/galera_3nodes/t/galera_garbd.test b/mysql-test/suite/galera_3nodes/t/galera_garbd.test index aaa9ecc8083..fa3cba0ab16 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_garbd.test +++ b/mysql-test/suite/galera_3nodes/t/galera_garbd.test @@ -99,6 +99,7 @@ DROP TABLE t1; --echo Restarting node #3 to satisfy MTR's end-of-test checks --connection node_3 +let $restart_noprint=2; --source include/start_mysqld.inc # Restore original auto_increment_offset values. diff --git a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test index 4733b686e93..c9c32f23230 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test +++ b/mysql-test/suite/galera_3nodes/t/galera_ipv6_mysqldump.test @@ -59,6 +59,7 @@ INSERT INTO t1 VALUES (1); --connection node_2 --echo Starting server ... --let $start_mysqld_params = --wsrep_sst_auth=sst: --wsrep_sst_method=mysqldump --wsrep-sst-receive-address=[::1].1:$NODE_MYPORT_2 +let $restart_noprint=2; --source include/start_mysqld.inc #--source suite/galera/include/galera_load_provider.inc diff --git a/mysql-test/suite/galera_3nodes/t/galera_safe_to_bootstrap.test b/mysql-test/suite/galera_3nodes/t/galera_safe_to_bootstrap.test index 053c0bd8ce9..082cb546e87 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_safe_to_bootstrap.test +++ b/mysql-test/suite/galera_3nodes/t/galera_safe_to_bootstrap.test @@ -87,8 +87,8 @@ CREATE TABLE t1 (f1 INTEGER) ENGINE=InnoDB; --source include/assert_grep.inc # Restart one node - --connection node_2 +let $restart_noprint=2; --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.2.expect --source include/start_mysqld.inc @@ -153,15 +153,18 @@ SET SESSION wsrep_on = OFF; --connection node_1 --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect +let $restart_noprint=2; --source include/start_mysqld.inc --source include/wait_until_connected_again.inc --connection node_2 --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.2.expect +let $restart_noprint=2; --source include/start_mysqld.inc --connection node_3 --let $_expect_file_name= $MYSQLTEST_VARDIR/tmp/mysqld.3.expect +let $restart_noprint=2; --source include/start_mysqld.inc --let $wait_condition = SELECT VARIABLE_VALUE = 3 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'; diff --git a/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test b/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test index 5c2cae75bd0..fb3af2cd25d 100644 --- a/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test +++ b/mysql-test/suite/galera_3nodes/t/galera_wsrep_schema.test @@ -59,6 +59,7 @@ SELECT COUNT(*) = 2 FROM mysql.wsrep_cluster_members; #disabled SELECT COUNT(*) = 2 FROM mysql.wsrep_cluster_member_history WHERE last_view_id = (SELECT MAX(last_view_id) FROM mysql.wsrep_cluster_member_history); --connection node_2 +let $restart_noprint=2; --source include/start_mysqld.inc --source include/wait_until_connected_again.inc diff --git a/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result b/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result index d670b8c24a0..58d02e541af 100644 --- a/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result +++ b/mysql-test/suite/galera_3nodes_sr/r/GCF-832.result @@ -15,6 +15,7 @@ START TRANSACTION; INSERT INTO t1 VALUES ('primary'),('primary'),('primary'),('primary'),('primary'); COMMIT; ERROR HY000: Lost connection to MySQL server during query +# restart connection node_1; SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; COUNT(*) = 0 diff --git a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_join_slave.result b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_join_slave.result index 0260ebec86a..dbdd95f837a 100644 --- a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_join_slave.result +++ b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_join_slave.result @@ -17,6 +17,7 @@ INSERT INTO t1 VALUES (3); INSERT INTO t1 VALUES (4); INSERT INTO t1 VALUES (5); connection node_2; +# restart connection node_1; INSERT INTO t1 VALUES (6); INSERT INTO t1 VALUES (7); diff --git a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_master.result b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_master.result index 1a179565666..4547d06dcf9 100644 --- a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_master.result +++ b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_master.result @@ -24,6 +24,7 @@ COUNT(*) = 0 1 INSERT INTO t1 VALUES (1); connection node_2; +# restart SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; COUNT(*) = 0 1 diff --git a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply.result b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply.result index 595bd30d675..db04c24b5b1 100644 --- a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply.result +++ b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply.result @@ -24,6 +24,7 @@ INSERT INTO t1 VALUES (8); INSERT INTO t1 VALUES (9); INSERT INTO t1 VALUES (10); connection node_2; +# restart connection node_1; INSERT INTO t1 VALUES (11); INSERT INTO t1 VALUES (12); diff --git a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply_rollback.result b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply_rollback.result index 239eb748385..ff9215cf31f 100644 --- a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply_rollback.result +++ b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_after_apply_rollback.result @@ -24,6 +24,7 @@ INSERT INTO t1 VALUES (8); INSERT INTO t1 VALUES (9); INSERT INTO t1 VALUES (10); connection node_2; +# restart connection node_1; INSERT INTO t1 VALUES (11); INSERT INTO t1 VALUES (12); diff --git a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_before_apply.result b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_before_apply.result index 4a135cd9274..e9dc5518e96 100644 --- a/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_before_apply.result +++ b/mysql-test/suite/galera_3nodes_sr/r/galera_sr_kill_slave_before_apply.result @@ -29,6 +29,7 @@ INSERT INTO t1 VALUES (4); INSERT INTO t1 VALUES (5); connection node_2; Killing server ... +# restart connection node_1; COMMIT; SELECT COUNT(*) = 5 FROM t1; diff --git a/mysql-test/suite/galera_sr/r/galera_sr_kill_all_nobootstrap.result b/mysql-test/suite/galera_sr/r/galera_sr_kill_all_nobootstrap.result index a78926a9794..45ca6909f29 100644 --- a/mysql-test/suite/galera_sr/r/galera_sr_kill_all_nobootstrap.result +++ b/mysql-test/suite/galera_sr/r/galera_sr_kill_all_nobootstrap.result @@ -14,7 +14,9 @@ Killing server ... connection node_1; Killing server ... connection node_1; +# restart connection node_2; +# restart connection node_1; SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; COUNT(*) = 0 diff --git a/mysql-test/suite/galera_sr/r/galera_sr_kill_all_norecovery.result b/mysql-test/suite/galera_sr/r/galera_sr_kill_all_norecovery.result index e707f04fd55..7ef86c65915 100644 --- a/mysql-test/suite/galera_sr/r/galera_sr_kill_all_norecovery.result +++ b/mysql-test/suite/galera_sr/r/galera_sr_kill_all_norecovery.result @@ -17,7 +17,9 @@ Killing server ... connection node_1; SET SESSION wsrep_sync_wait = 0; Killing server ... +# restart connection node_2; +# restart connection node_1; SELECT COUNT(*) `expect 0` FROM mysql.wsrep_streaming_log; expect 0 diff --git a/mysql-test/suite/galera_sr/r/galera_sr_kill_all_pcrecovery.result b/mysql-test/suite/galera_sr/r/galera_sr_kill_all_pcrecovery.result index 7525cd6d4b7..7731c19e4da 100644 --- a/mysql-test/suite/galera_sr/r/galera_sr_kill_all_pcrecovery.result +++ b/mysql-test/suite/galera_sr/r/galera_sr_kill_all_pcrecovery.result @@ -14,7 +14,9 @@ Killing server ... connection node_1; Killing server ... connection node_1; +# restart connection node_2; +# restart connection node_1; SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; COUNT(*) = 0 diff --git a/mysql-test/suite/galera_sr/r/galera_sr_kill_slave.result b/mysql-test/suite/galera_sr/r/galera_sr_kill_slave.result index b4e84b1b72a..d14de27d2b7 100644 --- a/mysql-test/suite/galera_sr/r/galera_sr_kill_slave.result +++ b/mysql-test/suite/galera_sr/r/galera_sr_kill_slave.result @@ -31,6 +31,7 @@ INSERT INTO t1 VALUES (8); INSERT INTO t1 VALUES (9); INSERT INTO t1 VALUES (10); connection node_2; +# restart connection node_1; INSERT INTO t1 VALUES (11); INSERT INTO t1 VALUES (12); diff --git a/mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result b/mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result index f1b60c7f76a..2e94461f377 100644 --- a/mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result +++ b/mysql-test/suite/galera_sr/r/galera_sr_mysqldump_sst.result @@ -24,6 +24,7 @@ Shutting down server ... connection node_1; connection node_2; Starting server ... +# restart: --wsrep_sst_auth=sst:sst --wsrep_sst_method=mysqldump --wsrep-sst-receive-address=127.0.0.1:16001 connection node_1; connection node_2; SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log; diff --git a/mysql-test/suite/galera_sr/r/galera_sr_shutdown_master.result b/mysql-test/suite/galera_sr/r/galera_sr_shutdown_master.result index eb493f66ed6..051b9d6b7ec 100644 --- a/mysql-test/suite/galera_sr/r/galera_sr_shutdown_master.result +++ b/mysql-test/suite/galera_sr/r/galera_sr_shutdown_master.result @@ -18,6 +18,7 @@ SELECT COUNT(*) = 0 FROM t1; COUNT(*) = 0 1 connection node_2; +# restart SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log; COUNT(*) = 0 1 diff --git a/mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result b/mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result index 568452b10b0..6218cffcb78 100644 --- a/mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result +++ b/mysql-test/suite/galera_sr/r/galera_sr_shutdown_slave.result @@ -20,6 +20,7 @@ connection node_1a; INSERT INTO t1 VALUES (14),(15),(16); COMMIT; connection node_2; +# restart SELECT COUNT(*) > 0 FROM mysql.wsrep_streaming_log; COUNT(*) > 0 1 diff --git a/mysql-test/suite/galera_sr/r/mysql-wsrep-features#9.result b/mysql-test/suite/galera_sr/r/mysql-wsrep-features#9.result index 990ea47f8bc..312c8efc6ef 100644 --- a/mysql-test/suite/galera_sr/r/mysql-wsrep-features#9.result +++ b/mysql-test/suite/galera_sr/r/mysql-wsrep-features#9.result @@ -9,6 +9,7 @@ Killing server ... connection node_1; ALTER TABLE t1 ADD COLUMN f2 INTEGER; connection node_2; +# restart connection node_2a; SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='t1'; COUNT(*) = 2 diff --git a/mysql-test/suite/wsrep/t/wsrep-recover-v25.test b/mysql-test/suite/wsrep/t/wsrep-recover-v25.test index f6a0f7fec97..743e2795c1c 100644 --- a/mysql-test/suite/wsrep/t/wsrep-recover-v25.test +++ b/mysql-test/suite/wsrep/t/wsrep-recover-v25.test @@ -37,6 +37,8 @@ if ($log_bin) { # The expected recovered seqno is 1 corresponding to initial cluster # configuration change. # +let $restart_noprint=2; + --source include/kill_mysqld.inc --source wsrep-recover-step.inc --echo Expect seqno 1 @@ -53,6 +55,7 @@ if ($log_bin) { # CREATE TABLE t1 (f1 INT PRIMARY KEY) ENGINE=InnoDB; +let $restart_noprint=2; --source include/kill_mysqld.inc --source wsrep-recover-step.inc --echo Expect seqno 3 @@ -71,6 +74,7 @@ CREATE TABLE t1 (f1 INT PRIMARY KEY) ENGINE=InnoDB; # INSERT INTO t1 VALUES (5); +let $restart_noprint=2; --source include/kill_mysqld.inc --source wsrep-recover-step.inc --echo Expect seqno 5 @@ -99,6 +103,7 @@ if ($log_bin) { --send INSERT INTO t1 VALUES (7) --connection default + let $restart_noprint=2; SET DEBUG_SYNC = "now WAIT_FOR after_prepare_reached"; --source include/kill_mysqld.inc --source wsrep-recover-step.inc diff --git a/mysql-test/suite/wsrep/t/wsrep-recover.test b/mysql-test/suite/wsrep/t/wsrep-recover.test index 7c1d0da3078..75271e45b15 100644 --- a/mysql-test/suite/wsrep/t/wsrep-recover.test +++ b/mysql-test/suite/wsrep/t/wsrep-recover.test @@ -36,6 +36,7 @@ if ($log_bin) { # The expected recovered seqno is 1 corresponding to initial cluster # configuration change. # +let $restart_noprint=2; --source include/kill_mysqld.inc --source wsrep-recover-step.inc --echo Expect seqno 1 @@ -50,6 +51,7 @@ if ($log_bin) { # The expected recovered seqno is 3 corresponding to two configuration # change events and CREATE TABLE. # +let $restart_noprint=2; CREATE TABLE t1 (f1 INT PRIMARY KEY) ENGINE=InnoDB; --source include/kill_mysqld.inc @@ -68,6 +70,7 @@ CREATE TABLE t1 (f1 INT PRIMARY KEY) ENGINE=InnoDB; # # The expected wsrep_last_committed after the server is restarted is 6. # +let $restart_noprint=2; INSERT INTO t1 VALUES (5); --source include/kill_mysqld.inc @@ -114,6 +117,7 @@ SET DEBUG_SYNC = "wsrep_before_commit_order_enter SIGNAL before_commit_order_rea SET DEBUG_SYNC = "now WAIT_FOR before_commit_order_reached"; --connection default +let $restart_noprint=2; --source include/kill_mysqld.inc --source wsrep-recover-step.inc --echo Expect seqno 6 @@ -163,6 +167,7 @@ SET DEBUG_SYNC = "now SIGNAL continue_after_certification"; SET DEBUG_SYNC = "now WAIT_FOR before_commit_order_reached_1"; --connection default +let $restart_noprint=2; --source include/kill_mysqld.inc --source wsrep-recover-step.inc --echo Expect seqno 7
participants (1)
-
jan