Skip to content

Commit dcaabf0

Browse files
author
Jan Lindström
committed
MDEV-18109: Galera 4: run galera_sr test suite
Fix some of the galera_sr suite test failures. Remove tests that are not going to be run because required feature is not supported. modified: mysql-test/suite/galera_sr/disabled.def deleted: mysql-test/suite/galera_sr/r/GCF-574.result modified: mysql-test/suite/galera_sr/r/galera_sr_cc_slave.result modified: mysql-test/suite/galera_sr/r/galera_sr_kill_all_norecovery.result modified: mysql-test/suite/galera_sr/r/galera_sr_load_data.result deleted: mysql-test/suite/galera_sr/r/galera_sr_sbr.result modified: mysql-test/suite/galera_sr/r/mysql-wsrep-features#148.result deleted: mysql-test/suite/galera_sr/r/mysql-wsrep-features#29.result deleted: mysql-test/suite/galera_sr/t/GCF-574.test modified: mysql-test/suite/galera_sr/t/galera_sr_cc_slave.test modified: mysql-test/suite/galera_sr/t/galera_sr_kill_all_norecovery.cnf modified: mysql-test/suite/galera_sr/t/galera_sr_kill_all_norecovery.test modified: mysql-test/suite/galera_sr/t/galera_sr_load_data.test deleted: mysql-test/suite/galera_sr/t/galera_sr_sbr.test modified: mysql-test/suite/galera_sr/t/mysql-wsrep-features#148.test deleted: mysql-test/suite/galera_sr/t/mysql-wsrep-features#29.test
1 parent e17fc72 commit dcaabf0

16 files changed

+42
-133
lines changed

‎mysql-test/suite/galera_sr/disabled.def

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
mysql-wsrep-features#29 : binlog_format=STATEMENT not supported with SR
2-
GCF-574 : CTAS is not supported together with SR
3-
galera_sr_sbr : binlog_format=STATEMENT not supported with SR
1+
galera_sr_table_contents : missing file

‎mysql-test/suite/galera_sr/r/GCF-574.result

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎mysql-test/suite/galera_sr/r/galera_sr_cc_slave.result

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
connection node_2;
22
connection node_1;
3+
connection node_1;
4+
connection node_2;
35
connection node_2;
46
SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
57
COUNT(*) = 0

‎mysql-test/suite/galera_sr/r/galera_sr_kill_all_norecovery.result

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
connection node_2;
22
connection node_1;
3+
connection node_1;
4+
connection node_2;
35
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
46
SET SESSION wsrep_trx_fragment_size = 1;
57
SET AUTOCOMMIT=OFF;

‎mysql-test/suite/galera_sr/r/galera_sr_load_data.result

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ COUNT(*) = 20000
1010
1
1111
wsrep_last_committed_diff
1212
1
13+
connection node_1;
1314
DROP TABLE t1;

‎mysql-test/suite/galera_sr/r/galera_sr_sbr.result

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎mysql-test/suite/galera_sr/r/mysql-wsrep-features#148.result

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ CREATE TABLE t2 (f1 INTEGER) ENGINE=InnoDB;
66
INSERT INTO t2 VALUES (6),(7),(8),(9),(10),(1);
77
connection node_2;
88
SET GLOBAL wsrep_slave_threads = 2;
9-
SET GLOBAL DEBUG = 'd,sync.wsrep_apply_cb';
10-
Warnings:
11-
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
9+
SET GLOBAL debug_dbug = 'd,sync.wsrep_apply_cb';
1210
connection node_1;
1311
SET SESSION wsrep_trx_fragment_size = 1;
1412
SET AUTOCOMMIT=OFF;
@@ -28,9 +26,7 @@ connection node_1;
2826
Got one of the listed errors
2927
connection node_2;
3028
SET GLOBAL wsrep_slave_threads = 1;
31-
SET GLOBAL DEBUG = '';
32-
Warnings:
33-
Warning 1287 '@@debug' is deprecated and will be removed in a future release. Please use '@@debug_dbug' instead
29+
SET GLOBAL debug_dbug = '';
3430
SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
3531
SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
3632
SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
@@ -40,3 +36,4 @@ COUNT(*) = 10
4036
1
4137
DROP TABLE t1;
4238
DROP TABLE t2;
39+
SET DEBUG_SYNC = RESET;

‎mysql-test/suite/galera_sr/r/mysql-wsrep-features#29.result

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎mysql-test/suite/galera_sr/t/GCF-574.test

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎mysql-test/suite/galera_sr/t/galera_sr_cc_slave.test

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
# leave the cluster.
88
#
99

10+
# Save original auto_increment_offset values.
11+
--let $node_1=node_1
12+
--let $node_2=node_2
13+
--source ../../galera/include/auto_increment_offset_save.inc
14+
1015
# Start with a clean slate
1116
--connection node_2
1217
SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
@@ -95,3 +100,6 @@ SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
95100
DROP TABLE t1;
96101

97102
CALL mtr.add_suppression("points to own listening address, blacklisting");
103+
104+
# Restore original auto_increment_offset values.
105+
--source ../../galera/include/auto_increment_offset_restore.inc

‎mysql-test/suite/galera_sr/t/galera_sr_kill_all_norecovery.cnf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22

33
[mysqld.1]
44
wsrep_provider_options='base_port=@mysqld.1.#galera_port;pc.recovery=false'
5+
auto_increment_offset=1
6+
7+
[mysqld.2]
8+
auto_increment_offset=2

‎mysql-test/suite/galera_sr/t/galera_sr_kill_all_norecovery.test

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
--source include/galera_cluster.inc
77
--source include/big_test.inc
88

9+
# Save original auto_increment_offset values.
10+
--let $node_1=node_1
11+
--let $node_2=node_2
12+
--source ../../galera/include/auto_increment_offset_save.inc
13+
914
CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
1015
SET SESSION wsrep_trx_fragment_size = 1;
1116
SET AUTOCOMMIT=OFF;
@@ -50,4 +55,6 @@ SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
5055
SELECT COUNT(*) = 0 FROM t1;
5156
SELECT COUNT(*) = 0 FROM mysql.wsrep_streaming_log;
5257

58+
--source ../../galera/include/auto_increment_offset_restore.inc
59+
5360
DROP TABLE t1;

‎mysql-test/suite/galera_sr/t/galera_sr_load_data.test

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB;
2424

2525
--connection node_1
2626
--disable_query_log
27+
--disable_warnings
28+
set global wsrep_load_data_splitting=ON;
29+
--enable_warnings
2730
--eval LOAD DATA INFILE '$MYSQLTEST_VARDIR/tmp/galera_sr_load_data.csv' INTO TABLE t1;
2831
--enable_query_log
2932

@@ -36,4 +39,11 @@ SELECT COUNT(*) = 20000 FROM t1;
3639
--eval SELECT $wsrep_last_committed_after - $wsrep_last_committed_before = 3 AS wsrep_last_committed_diff
3740
--enable_query_log
3841

42+
--connection node_1
43+
--disable_query_log
44+
--disable_warnings
45+
set global wsrep_load_data_splitting=OFF;
46+
--enable_warnings
47+
--enable_query_log
48+
3949
DROP TABLE t1;

‎mysql-test/suite/galera_sr/t/galera_sr_sbr.test

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎mysql-test/suite/galera_sr/t/mysql-wsrep-features#148.test

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ INSERT INTO t2 VALUES (6),(7),(8),(9),(10),(1);
1616

1717
--connection node_2
1818
SET GLOBAL wsrep_slave_threads = 2;
19-
SET GLOBAL DEBUG = 'd,sync.wsrep_apply_cb';
19+
SET GLOBAL debug_dbug = 'd,sync.wsrep_apply_cb';
2020

2121
# Begin SR transaction
2222
--connection node_1
@@ -48,7 +48,7 @@ COMMIT;
4848

4949
--connection node_2
5050
SET GLOBAL wsrep_slave_threads = 1;
51-
SET GLOBAL DEBUG = '';
51+
SET GLOBAL debug_dbug = '';
5252
SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
5353
SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
5454
SET DEBUG_SYNC='now SIGNAL signal.wsrep_apply_cb';
@@ -58,3 +58,5 @@ SELECT COUNT(*) = 10 FROM t1;
5858

5959
DROP TABLE t1;
6060
DROP TABLE t2;
61+
62+
SET DEBUG_SYNC = RESET;

‎mysql-test/suite/galera_sr/t/mysql-wsrep-features#29.test

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)