diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2020-09-14 11:48:36 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2020-09-14 11:48:36 +0300 |
| commit | fd5cbbb91ee0d00aeefdd59e5538a30c011e51ee (patch) | |
| tree | 7ebf7eaa7cfa430ad097cbc1910c7e1619c07e62 | |
| parent | 5f2728d594bf0202afebeff2323324df79b50425 (diff) | |
| download | mariadb-git-fd5cbbb91ee0d00aeefdd59e5538a30c011e51ee.tar.gz | |
MDEV-23591 : galera_3nodes.GCF-354 MTR failed: 1047: WSREP has not yet prepared node for application use
Stabilize test.
| -rw-r--r-- | mysql-test/suite/galera_3nodes/r/GCF-354.result | 11 | ||||
| -rw-r--r-- | mysql-test/suite/galera_3nodes/t/GCF-354.test | 20 |
2 files changed, 17 insertions, 14 deletions
diff --git a/mysql-test/suite/galera_3nodes/r/GCF-354.result b/mysql-test/suite/galera_3nodes/r/GCF-354.result index dad57fe15ec..1fa4265edcf 100644 --- a/mysql-test/suite/galera_3nodes/r/GCF-354.result +++ b/mysql-test/suite/galera_3nodes/r/GCF-354.result @@ -1,17 +1,18 @@ connection node_2; connection node_1; -connection node_2; -SET wsrep_on=OFF; -DROP SCHEMA test; connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3; connection node_3; connection node_1; connection node_2; connection node_3; +connection node_2; SET wsrep_on=OFF; -CREATE TABLE test.t1 (f1 INTEGER); +DROP SCHEMA test; +connection node_3; +SET SESSION wsrep_on=OFF; +CREATE TABLE test.t1 (f1 INTEGER) engine=innodb; connection node_1; -CREATE TABLE test.t1 (f1 INTEGER); +CREATE TABLE test.t1 (f1 INTEGER) engine=innodb; SHOW STATUS LIKE 'wsrep_cluster_status'; Variable_name Value wsrep_cluster_status Primary diff --git a/mysql-test/suite/galera_3nodes/t/GCF-354.test b/mysql-test/suite/galera_3nodes/t/GCF-354.test index c428aee7732..d4e2bc095fa 100644 --- a/mysql-test/suite/galera_3nodes/t/GCF-354.test +++ b/mysql-test/suite/galera_3nodes/t/GCF-354.test @@ -1,11 +1,5 @@ --source include/galera_cluster.inc ---source include/have_innodb.inc -# -# 1. Create different inconsistencies on nodes 2 and 3 -# ---connection node_2 -SET wsrep_on=OFF; -DROP SCHEMA test; +--source include/force_restart.inc --connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3 --connection node_3 @@ -16,15 +10,23 @@ DROP SCHEMA test; --let $node_3=node_3 --source ../galera/include/auto_increment_offset_save.inc +# +# 1. Create different inconsistencies on nodes 2 and 3 +# +--connection node_2 SET wsrep_on=OFF; -CREATE TABLE test.t1 (f1 INTEGER); +DROP SCHEMA test; + +--connection node_3 +SET SESSION wsrep_on=OFF; +CREATE TABLE test.t1 (f1 INTEGER) engine=innodb; # # 2. The following should generate different errors on nodes 2 and 3 and # trigger voting with 3 different votes. node_1 should remain alone # in the cluster. # --connection node_1 -CREATE TABLE test.t1 (f1 INTEGER); +CREATE TABLE test.t1 (f1 INTEGER) engine=innodb; --let $wait_condition = SELECT VARIABLE_VALUE = 1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size' --source include/wait_condition.inc |