MENT-802 : galera.GCF-329A MTR failed: Closing during nonblocking operation

Add wait_condition's to wait that cluster size is expected and that
NBO alter table has finished.

4 files changed, 45 insertions, 19 deletions

diff --git a/mysql-test/suite/galera/r/GCF-329A.result b/mysql-test/suite/galera/r/GCF-329A.result
index eb7f555b7b5..3d31efb56f5 100644
--- a/mysql-test/suite/galera/r/GCF-329A.result
+++ b/mysql-test/suite/galera/r/GCF-329A.result
@@ -9,12 +9,12 @@ SET SESSION wsrep_osu_method=NBO;
 ALTER TABLE t1 LOCK=SHARED, ADD PRIMARY KEY (f1);;
 connection node_2;
 connection node_2a;
-SELECT COUNT(*) = 1 FROM t1;
-COUNT(*) = 1
-1
-SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-VARIABLE_VALUE = 2
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
+EXPECT_1
 1
+SELECT VARIABLE_VALUE as WSREP_CLUSTER_SIZE_EXPECT_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+WSREP_CLUSTER_SIZE_EXPECT_2
+2
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -38,3 +38,5 @@ CALL mtr.add_suppression("Aborting");
 CALL mtr.add_suppression("Plugin 'InnoDB' will be forced to shutdown");
 CALL mtr.add_suppression("Slave SQL: Error 'Got error 7 during COMMIT'");
 CALL mtr.add_suppression("TO isolation failed for NBO phase two:");
+CALL mtr.add_suppression("WSREP: Closing during nonblocking operation. Node will be left in inconsistent state and must be re-initialized either by full SST or from backup.");
+CALL mtr.add_suppression("WSREP: Failed to report last committed .*");
diff --git a/mysql-test/suite/galera/r/GCF-329B.result b/mysql-test/suite/galera/r/GCF-329B.result
index 5d599d213a1..35e5f3ea40a 100644
--- a/mysql-test/suite/galera/r/GCF-329B.result
+++ b/mysql-test/suite/galera/r/GCF-329B.result
@@ -13,15 +13,21 @@ Killing server ...
 connection node_1a;
 connection node_2;
 connection node_2a;
-SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='t1';
-COUNT(*) = 2
-1
-SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
-VARIABLE_VALUE = 2
-1
+SELECT COUNT(*) AS EXPECT_2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='t1';
+EXPECT_2
+2
+SELECT VARIABLE_VALUE AS WSREP_CLUSTER_SIZE_EXPECT_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+WSREP_CLUSTER_SIZE_EXPECT_2
+2
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f1` int(11) DEFAULT NULL,
+  `f2` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
 connection node_1;
-SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='t1';
-COUNT(*) = 2
-1
+SELECT COUNT(*) AS EXPECT_2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='t1';
+EXPECT_2
+2
 SET SESSION wsrep_OSU_method=TOI;
 DROP TABLE t1;
diff --git a/mysql-test/suite/galera/t/GCF-329A.test b/mysql-test/suite/galera/t/GCF-329A.test
index 22067530fef..8fa36768fee 100644
--- a/mysql-test/suite/galera/t/GCF-329A.test
+++ b/mysql-test/suite/galera/t/GCF-329A.test
@@ -26,12 +26,20 @@ SET SESSION wsrep_osu_method=NBO;
 --connection node_2a
 --source include/galera_wait_ready.inc
 
-SELECT COUNT(*) = 1 FROM t1;
-SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
+--source include/wait_condition.inc
+
+SELECT COUNT(*) AS EXPECT_1 FROM t1;
+SELECT VARIABLE_VALUE as WSREP_CLUSTER_SIZE_EXPECT_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+
+--let $wait_condition = SELECT COUNT(*) = 1 FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS WHERE TABLE_NAME='t1' AND CONSTRAINT_TYPE='PRIMARY KEY'
+--source include/wait_condition.inc
+
 SHOW CREATE TABLE t1;
 
 --connection node_1
 --reap
+
 SHOW CREATE TABLE t1;
 
 SET SESSION wsrep_osu_method=TOI;
@@ -47,3 +55,6 @@ CALL mtr.add_suppression("Aborting");
 CALL mtr.add_suppression("Plugin 'InnoDB' will be forced to shutdown");
 CALL mtr.add_suppression("Slave SQL: Error 'Got error 7 during COMMIT'");
 CALL mtr.add_suppression("TO isolation failed for NBO phase two:");
+CALL mtr.add_suppression("WSREP: Closing during nonblocking operation. Node will be left in inconsistent state and must be re-initialized either by full SST or from backup.");
+CALL mtr.add_suppression("WSREP: Failed to report last committed .*");
+
diff --git a/mysql-test/suite/galera/t/GCF-329B.test b/mysql-test/suite/galera/t/GCF-329B.test
index f3a24810948..be863fca9ec 100644
--- a/mysql-test/suite/galera/t/GCF-329B.test
+++ b/mysql-test/suite/galera/t/GCF-329B.test
@@ -41,13 +41,20 @@ SET SESSION wsrep_OSU_method=NBO;
 --source include/galera_connect.inc
 --connection node_2a
 
-SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='t1';
-SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size'
+--source include/wait_condition.inc
+
+--let $wait_condition = SELECT COUNT(*)=2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='t1'
+--source include/wait_condition.inc
+
+SELECT COUNT(*) AS EXPECT_2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='t1';
+SELECT VARIABLE_VALUE AS WSREP_CLUSTER_SIZE_EXPECT_2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
+SHOW CREATE TABLE t1;
 
 --connection node_1
 --reap
 
-SELECT COUNT(*) = 2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='t1';
+SELECT COUNT(*) AS EXPECT_2 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='t1';
 SET SESSION wsrep_OSU_method=TOI;
 
 --disable_query_log