[Commits] 0a479f78602: More test failure fixes.

jan jan.lindstrom at mariadb.com
Wed Aug 16 13:10:18 EEST 2017


revision-id: 0a479f786020d3c1431a25523661759748404770 (mariadb-galera-10.0.31-49-g0a479f78602)
parent(s): 7ce37d97574963a852e398142eb4b5090740f1f2
author: Jan Lindström
committer: Jan Lindström
timestamp: 2017-08-16 13:10:01 +0300
message:

More test failure fixes.

---
 mysql-test/suite/galera/disabled.def                     | 1 +
 mysql-test/suite/galera/r/galera_var_node_address.result | 1 +
 mysql-test/suite/galera/r/pxc-421.result                 | 3 +++
 mysql-test/suite/galera/t/galera_var_node_address.test   | 2 ++
 mysql-test/suite/galera/t/pxc-421.test                   | 5 +++++
 5 files changed, 12 insertions(+)

diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def
index 59f1ec37986..84d2b1c54bf 100644
--- a/mysql-test/suite/galera/disabled.def
+++ b/mysql-test/suite/galera/disabled.def
@@ -44,3 +44,4 @@ galera.galera_wan : MDEV-12319 #Failed to start mysqld
 galera.rpl_row_annotate : MDEV-12319 #Failed to start mysqld
 galera.MW-44 : MDEV-12319
 galera.galera_var_slave_threads : MDEV-12319
+MW-336: MDEV-13549 Galera test failures
diff --git a/mysql-test/suite/galera/r/galera_var_node_address.result b/mysql-test/suite/galera/r/galera_var_node_address.result
index b562883176a..cf36e964f93 100644
--- a/mysql-test/suite/galera/r/galera_var_node_address.result
+++ b/mysql-test/suite/galera/r/galera_var_node_address.result
@@ -1,4 +1,5 @@
 call  mtr.add_suppression("WSREP: Stray state UUID msg: .* current group state WAIT_STATE_UUID .*");
+call  mtr.add_suppression("WSREP: Protocol violation. JOIN message sender .* is not in state transfer (.*). Message ignored.");
 SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 VARIABLE_VALUE = 4
 1
diff --git a/mysql-test/suite/galera/r/pxc-421.result b/mysql-test/suite/galera/r/pxc-421.result
index 1822201f338..f5c0fabcd6e 100644
--- a/mysql-test/suite/galera/r/pxc-421.result
+++ b/mysql-test/suite/galera/r/pxc-421.result
@@ -6,6 +6,7 @@ set GLOBAL wsrep_slave_threads=16;
 SET GLOBAL wsrep_provider='none';
 INSERT INTO t1 VALUES (2);
 INSERT INTO t1 VALUES (3);
+set SESSION wsrep_sync_wait=0;
 INSERT INTO t1 VALUES (4);
 set GLOBAL wsrep_slave_threads=5;
 SELECT COUNT(*) = 5 FROM t1;
@@ -25,6 +26,7 @@ SET GLOBAL wsrep_slave_threads = 1;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 16
+SET GLOBAL auto_increment_offset = 2;
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 15
@@ -33,3 +35,4 @@ Variable_name	Value
 wsrep_slave_threads	12
 SET GLOBAL wsrep_slave_threads = 1;
 DROP TABLE t1;
+SET GLOBAL auto_increment_offset = 1;
diff --git a/mysql-test/suite/galera/t/galera_var_node_address.test b/mysql-test/suite/galera/t/galera_var_node_address.test
index c2105823326..3353652d8b9 100644
--- a/mysql-test/suite/galera/t/galera_var_node_address.test
+++ b/mysql-test/suite/galera/t/galera_var_node_address.test
@@ -7,6 +7,8 @@
 --source include/have_innodb.inc
 
 call  mtr.add_suppression("WSREP: Stray state UUID msg: .* current group state WAIT_STATE_UUID .*");
+call  mtr.add_suppression("WSREP: Protocol violation. JOIN message sender .* is not in state transfer (.*). Message ignored.");
+
 SELECT VARIABLE_VALUE = 4 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
 
 --connection node_1
diff --git a/mysql-test/suite/galera/t/pxc-421.test b/mysql-test/suite/galera/t/pxc-421.test
index 8a360b12f4c..381f9bb4494 100644
--- a/mysql-test/suite/galera/t/pxc-421.test
+++ b/mysql-test/suite/galera/t/pxc-421.test
@@ -31,6 +31,7 @@ INSERT INTO t1 VALUES (3);
 --eval SET GLOBAL wsrep_cluster_address = '$wsrep_cluster_address_orig';
 --enable_query_log
 
+set SESSION wsrep_sync_wait=0;
 --source include/wait_until_connected_again.inc
 --source include/galera_wait_ready.inc
 
@@ -53,8 +54,12 @@ show global variables like 'wsrep_slave_threads';
 --eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_2
 SELECT COUNT(*) FROM t1;
 
+SET GLOBAL auto_increment_offset = 2;
+
 --connection node_1
 SELECT COUNT(*) FROM t1;
 show global variables like 'wsrep_slave_threads';
 --eval SET GLOBAL wsrep_slave_threads = $wsrep_slave_1
 DROP TABLE t1;
+
+SET GLOBAL auto_increment_offset = 1;


More information about the commits mailing list