mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Adjust wsrep, galera, galera_3nodes, galera_sr and galera_3nodes_sr tests
after commit b5615eff0d
This commit is contained in:
parent
a10e29cc6d
commit
e10f9e6c81
20 changed files with 34 additions and 1 deletions
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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';
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue