diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-12-23 12:43:15 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-12-23 12:43:15 +0200 |
| commit | cc9c55b2e27676694b5fe66f908d35eef7409dd2 (patch) | |
| tree | 7bc10e0cd09430ec4df27620b113806a729de1a5 /mysql-test/suite | |
| parent | 5e0c80c2a53c494a517289e5ed95b1aa52010b49 (diff) | |
| download | mariadb-git-cc9c55b2e27676694b5fe66f908d35eef7409dd2.tar.gz | |
MDEV-21189 : Dropping partition with 'wsrep_OSU_method=RSU' and 'SESSION sql_log_bin = 0' cases the galera node to hang
Test cleanup. Best practice for using RSU, is to isolate the node
up-front, so this test did not reflect real world scenario
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/galera/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/suite/galera/r/galera_partition.result | 13 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_partition.test | 8 |
3 files changed, 7 insertions, 15 deletions
diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 40243ad556f..061697a7fd8 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -43,6 +43,5 @@ galera_var_reject_queries : assertion in inline_mysql_socket_send galera_var_retry_autocommit: MDEV-18181 Galera test failure on galera.galera_var_retry_autocommit galera_wan : MDEV-17259 Test failure on galera.galera_wan mysql-wsrep#198 : MDEV-18935 Galera test mysql-wsrep#198 sporaric assertion transaction.cpp:362: int wsrep::transaction::before_commit(): Assertion `state() == s_executing || state() == s_committing || state() == s_must_abort || state() == s_replaying' failed. -galera_partition : MDEV-21189 test timeout partition : MDEV-19958 Galera test failure on galera.partition query_cache: MDEV-15805 Test failure on galera.query_cache diff --git a/mysql-test/suite/galera/r/galera_partition.result b/mysql-test/suite/galera/r/galera_partition.result index d845de12c45..ea35eeab96e 100644 --- a/mysql-test/suite/galera/r/galera_partition.result +++ b/mysql-test/suite/galera/r/galera_partition.result @@ -1,9 +1,10 @@ +connection node_2; +connection node_1; connection node_1; call mtr.add_suppression("WSREP: RSU failed due to pending transactions, schema: test, query ALTER.*"); call mtr.add_suppression("WSREP: ALTER TABLE isolation failure"); connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3; connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4; -connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1; connection node_1; CREATE TABLE t1( id bigint unsigned NOT NULL AUTO_INCREMENT, @@ -396,13 +397,11 @@ SELECT COUNT(*) FROM t1; COUNT(*) 350 connection node_2; -call p1(100);; -connection node_1a; -call p1(100);; +call p1(10);; connection node_3; -call p1(100);; +call p1(10);; connection node_4; -call p1(100);; +call p1(10);; connection node_1; SET SESSION wsrep_OSU_method='RSU'; SELECT @@wsrep_OSU_method; @@ -419,6 +418,6 @@ TOI connection node_2; connection node_3; connection node_4; -connection node_1a; +connection node_1; DROP TABLE t1; DROP PROCEDURE p1; diff --git a/mysql-test/suite/galera/t/galera_partition.test b/mysql-test/suite/galera/t/galera_partition.test index 821bfd81fec..af725836f53 100644 --- a/mysql-test/suite/galera/t/galera_partition.test +++ b/mysql-test/suite/galera/t/galera_partition.test @@ -9,7 +9,6 @@ call mtr.add_suppression("WSREP: ALTER TABLE isolation failure"); --connect node_3, 127.0.0.1, root, , test, $NODE_MYPORT_3 --connect node_4, 127.0.0.1, root, , test, $NODE_MYPORT_4 ---connect node_1a, 127.0.0.1, root, , test, $NODE_MYPORT_1 --connection node_1 @@ -410,9 +409,6 @@ SELECT COUNT(*) FROM t1; --connection node_2 --send call p1(10); ---connection node_1a ---send call p1(10); - --connection node_3 --send call p1(10); @@ -446,9 +442,7 @@ reap; --error 0,ER_LOCK_DEADLOCK reap; ---connection node_1a ---error 0,ER_LOCK_DEADLOCK -reap; +--connection node_1 DROP TABLE t1; DROP PROCEDURE p1; |