mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-27 01:04:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

galera mtr suite: fixes for unstable tests

Browse source
This commit is contained in:
Julius Goryavsky 2024-09-19 09:02:46 +02:00
parent 391c9db486
commit cb83ae210c
10 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/suite/galera/t/MW-329.test
View file

@ -87,7 +87,7 @@ while ($count)
--enable_query_log --enable_query_log
--connection node_1b --connection node_1b
--error 0,2013,1317,2026 --error 0,1317,2013,2026
--reap --reap
--enable_query_log --enable_query_log
--enable_result_log --enable_result_log

1
mysql-test/suite/galera/t/galera_as_slave.test
View file

@ -55,7 +55,6 @@ INSERT INTO t1 VALUES (4,1);
--connection node_3 --connection node_3
DROP TABLE t1; DROP TABLE t1;
--connection node_2 --connection node_2
--let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1'; --let $wait_condition = SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 't1';
--source include/wait_condition.inc --source include/wait_condition.inc

2
mysql-test/suite/galera/t/galera_backup_stage.test
View file

@ -87,7 +87,7 @@ ALTER TABLE t1 ADD COLUMN (f4 int(10));
--source include/wait_condition.inc --source include/wait_condition.inc
--let $wait_condition = SELECT COUNT(*)=1 FROM information_schema.metadata_lock_info WHERE TABLE_NAME='t1' AND THREAD_ID=$insert_id --let $wait_condition = SELECT COUNT(*)=1 FROM information_schema.metadata_lock_info WHERE TABLE_NAME='t1' AND THREAD_ID=$insert_id
--source include/wait_condition.inc --source include/wait_condition.inc
--let $wait_condition = SELECT COUNT(*)=2 FROM information_schema.processlist WHERE Info like 'INSERT INTO t1 (f1) values("node1%")' AND (State = 'Commit' OR State='Waiting for certification') --let $wait_condition = SELECT COUNT(*)=2 FROM information_schema.processlist WHERE Info like 'INSERT INTO t1 (f1) values("node1%")' AND (State = 'Commit' OR State='Waiting for certification')
--source include/wait_condition.inc --source include/wait_condition.inc
# nothing after BLOCK_DDL is applied # nothing after BLOCK_DDL is applied

2
mysql-test/suite/galera/t/galera_bf_kill_debug.test
View file

@ -131,7 +131,7 @@ SET DEBUG_SYNC = "now WAIT_FOR bwoc_reached";
SET DEBUG_SYNC = "now SIGNAL bwoc_continue"; SET DEBUG_SYNC = "now SIGNAL bwoc_continue";
SET DEBUG_SYNC='RESET'; SET DEBUG_SYNC='RESET';
--connection node_2a --connection node_2a
--error 0,1213 --error 0,1213,2013,2026
--reap --reap
--connection node_2 --connection node_2

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

@ -51,7 +51,7 @@ SET SESSION wsrep_sync_wait = 0;
--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'Waiting for table metadata lock%'; --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'Waiting for table metadata lock%';
--source include/wait_condition.inc --source include/wait_condition.inc
--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE STATE LIKE 'Commit'; --let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE (STATE LIKE 'Commit' or STATE = 'Waiting for certification');
--source include/wait_condition.inc --source include/wait_condition.inc
UNLOCK TABLES; UNLOCK TABLES;

2
mysql-test/suite/galera/t/galera_sst_mariabackup.cnf
View file

@ -14,7 +14,7 @@ innodb_undo_tablespaces=0
wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=1;pc.ignore_sb=true' wsrep_provider_options='base_port=@mysqld.2.#galera_port;gcache.size=1;pc.ignore_sb=true'
innodb_fast_shutdown=0 innodb_fast_shutdown=0
innodb_undo_tablespaces=3 innodb_undo_tablespaces=3
innodb_log_file_buffering loose_innodb_log_file_buffering
[sst] [sst]
transferfmt=@ENV.MTR_GALERA_TFMT transferfmt=@ENV.MTR_GALERA_TFMT

6
mysql-test/suite/galera/t/galera_var_reject_queries.test
View file

@ -5,10 +5,6 @@
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/have_innodb.inc --source include/have_innodb.inc
if (`select version() not like '10.10.3-%'`) {
skip disabled until new C/C;
}
CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) engine=innodb; CREATE TABLE t1 (f1 INTEGER NOT NULL PRIMARY KEY) engine=innodb;
--connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1 --connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1
@ -26,7 +22,7 @@ SELECT * FROM t1;
# Original behavior was lost connection, # Original behavior was lost connection,
# but since 10.1, we allow controlling connection to remain alive # but since 10.1, we allow controlling connection to remain alive
# #
--error 0,2013 --error 0,2013,2026
SET GLOBAL wsrep_reject_queries = ALL_KILL; SET GLOBAL wsrep_reject_queries = ALL_KILL;
--connection node_1a --connection node_1a

6
mysql-test/suite/galera/t/rpl_galera_to_mariadb_clone_slave_using_mariadb-backup.cnf
View file

@ -1,10 +1,10 @@
!include ../galera_2nodes_as_master.cnf !include ../galera_2nodes_as_master.cnf
[mysqld.1] [mysqld.1]
innodb-log-file-buffering loose-innodb-log-file-buffering
[mysqld.2] [mysqld.2]
innodb-log-file-buffering loose-innodb-log-file-buffering
[mysqld.3] [mysqld.3]
innodb-log-file-buffering loose-innodb-log-file-buffering

2
mysql-test/suite/galera_sr/r/galera_sr_cc_master.result
View file

@ -27,7 +27,7 @@ SET GLOBAL wsrep_cluster_address = '';
SET SESSION wsrep_sync_wait = DEFAULT; SET SESSION wsrep_sync_wait = DEFAULT;
connection node_2; connection node_2;
INSERT INTO t1 VALUES (6); INSERT INTO t1 VALUES (6);
ERROR HY000: Lost connection to server during query Got one of the listed errors
connection node_1; connection node_1;
SELECT COUNT(*) AS EXPECT_0 FROM mysql.wsrep_streaming_log; SELECT COUNT(*) AS EXPECT_0 FROM mysql.wsrep_streaming_log;
EXPECT_0 EXPECT_0

6
mysql-test/suite/galera_sr/t/galera_sr_cc_master.test
View file

@ -1,10 +1,6 @@
--source include/galera_cluster.inc --source include/galera_cluster.inc
--source include/have_innodb.inc --source include/have_innodb.inc
if (`select version() not like '10.10.3-%'`) {
skip disabled until new C/C;
}
# #
# Test the effect of Cluster Configuration Change on a concurrently-running SR transaction # Test the effect of Cluster Configuration Change on a concurrently-running SR transaction
# We use SET GLOBAL wsrep_cluster_address = '' to cause the master (node_2) to temporarily # We use SET GLOBAL wsrep_cluster_address = '' to cause the master (node_2) to temporarily
@ -55,7 +51,7 @@ SET GLOBAL wsrep_cluster_address = '';
SET SESSION wsrep_sync_wait = DEFAULT; SET SESSION wsrep_sync_wait = DEFAULT;
--connection node_2 --connection node_2
--error 2013 # CR_SERVER_LOST --error 2013,2026
INSERT INTO t1 VALUES (6); INSERT INTO t1 VALUES (6);
--connection node_1 --connection node_1