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:57:22 +0200 |
| commit | 17b1b8118a4cfbd9d2a711d5c8f784c26e85864b (patch) | |
| tree | 69f1aca471c0c53551739d4331146c1b5862aba8 | |
| parent | 90ba87cb9e3307fff4785cadf2d058e1ce4288a4 (diff) | |
| download | mariadb-git-17b1b8118a4cfbd9d2a711d5c8f784c26e85864b.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
| -rw-r--r-- | mysql-test/suite/galera/r/galera_partition.result | 6 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_partition.test | 9 |
2 files changed, 2 insertions, 13 deletions
diff --git a/mysql-test/suite/galera/r/galera_partition.result b/mysql-test/suite/galera/r/galera_partition.result index b783dbf5a3d..c21d1005293 100644 --- a/mysql-test/suite/galera/r/galera_partition.result +++ b/mysql-test/suite/galera/r/galera_partition.result @@ -3,7 +3,6 @@ call mtr.add_suppression("WSREP: RSU failed due to pending transactions, schema: 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, @@ -398,9 +397,6 @@ COUNT(*) connection node_2; call mtr.add_suppression("WSREP: Sending JOIN failed:.*"); call p1(100);; -connection node_1a; -call mtr.add_suppression("WSREP: Sending JOIN failed:.*"); -call p1(100);; connection node_3; call mtr.add_suppression("WSREP: Sending JOIN failed:.*"); call p1(100);; @@ -423,6 +419,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 00b663a4ec5..66b2a5c10f6 100644 --- a/mysql-test/suite/galera/t/galera_partition.test +++ b/mysql-test/suite/galera/t/galera_partition.test @@ -8,7 +8,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,10 +409,6 @@ SELECT COUNT(*) FROM t1; call mtr.add_suppression("WSREP: Sending JOIN failed:.*"); --send call p1(100); ---connection node_1a -call mtr.add_suppression("WSREP: Sending JOIN failed:.*"); ---send call p1(100); - --connection node_3 call mtr.add_suppression("WSREP: Sending JOIN failed:.*"); --send call p1(100); @@ -449,9 +444,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; |