revision-id: db6385e26019c12fd8027bff42b35eb9e8039ab7 (mariadb-10.3.6-304-gdb6385e2601) parent(s): b11b6458adf193be39d1463735d10e368feda9d6 author: Jan Lindström committer: Jan Lindström timestamp: 2019-01-16 07:57:11 +0200 message: Enable galera_gcache_recover test and remove unnecessary file. --- mysql-test/suite/galera/disabled.def | 1 - mysql-test/suite/galera/r/galera_gcache_recover.result | 9 +++++++++ mysql-test/suite/galera/t/disabled.def | 14 -------------- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/mysql-test/suite/galera/disabled.def b/mysql-test/suite/galera/disabled.def index 21f82473a0f..c9cb76126a5 100644 --- a/mysql-test/suite/galera/disabled.def +++ b/mysql-test/suite/galera/disabled.def @@ -20,7 +20,6 @@ galera_as_slave_preordered : wsrep-preordered feature not merged to MariaDB GAL-419 : MDEV-13549 Galera test failures galera_var_notify_cmd : MDEV-13549 Galera test failures galera_as_slave_replication_bundle : MDEV-13549 Galera test failures -galera_gcache_recover : MDEV-13549 Galera test failures galera_gcache_recover_full_gcache : MDEV-13549 Galera test failures galera_gcache_recover_manytrx : MDEV-13549 Galera test failures galera_ssl_upgrade : MDEV-13549 Galera test failures diff --git a/mysql-test/suite/galera/r/galera_gcache_recover.result b/mysql-test/suite/galera/r/galera_gcache_recover.result index 127bcba39d8..819c595ece3 100644 --- a/mysql-test/suite/galera/r/galera_gcache_recover.result +++ b/mysql-test/suite/galera/r/galera_gcache_recover.result @@ -1,18 +1,27 @@ +connection node_2; +connection node_1; CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB; INSERT INTO t1 VALUES (1); SET SESSION wsrep_sync_wait = 0; +connection node_2; SET SESSION wsrep_sync_wait = 0; Killing server ... +connection node_1; INSERT INTO t1 VALUES (2); Killing server ... +connection node_1; Performing --wsrep-recover ... Using --wsrep-start-position when starting mysqld ... INSERT INTO t1 VALUES (3); +connection node_2; Performing --wsrep-recover ... Using --wsrep-start-position when starting mysqld ... +connection node_1; include/diff_servers.inc [servers=1 2] +connection node_1; CALL mtr.add_suppression("Skipped GCache ring buffer recovery"); include/assert_grep.inc [async IST sender starting to serve] +connection node_2; CALL mtr.add_suppression("Skipped GCache ring buffer recovery"); include/assert_grep.inc [Recovering GCache ring buffer: found gapless sequence] DROP TABLE t1; diff --git a/mysql-test/suite/galera/t/disabled.def b/mysql-test/suite/galera/t/disabled.def deleted file mode 100644 index fc63e331023..00000000000 --- a/mysql-test/suite/galera/t/disabled.def +++ /dev/null @@ -1,14 +0,0 @@ -galera_wsrep_provider_unset_set : lp1379204 'Unsupported protocol downgrade: incremental data collection disabled. Expect abort.' -galera_kill_nochanges : mysql-wsrep#24 Galera server does not restart properly if killed -galera_toi_ddl_fk_insert : qa#39 galera_toi_ddl_fk_insert fails sporadically -galera_sst_xtrabackup-v2-options : SST Encryption does not work with xtrabackup 2.4.2 -#galera_autoinc_sst_xtrabackup : due to cert index preload, this test will never pass in current form (gcache.size=1) -GCF-574 : CTAS is not supported together with SR -galera_split_brain : is worked on with tracker GCF-998 -galera_sr_kill_all_pcrecovery : is worked on with tracker GCF-1068 -galera_var_notify_cmd : is worked on with tracker GCF-1071 -galera_gcache_recover_manytrx : is worked on with tracker GCF-1077 -GCF-1081 : tries to BF abort earlier trx, needs to be reimplemented -galera_bf_abort_group_commit : requires galera_sr_bf_abort.inc, probably needs reimplementation -galera_as_slave_gtid_replicate_do_db_cc : assertion -galera_autoinc_sst_xtrabackup : fails and reserves SST port until socat times out