Skip to content

Commit 33f1987

Browse files
committed
MDEV-18593 : galera.galera_gcache_recover_full_gcache: Test failure: galera_gcache_recover_full_gcache.test: assert_grep.inc failed
Grep only the fact that we need to fall back to SST.
1 parent 577c61e commit 33f1987

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

mysql-test/suite/galera/r/galera_gcache_recover_full_gcache.result

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,18 @@ connection node_2;
1717
Performing --wsrep-recover ...
1818
Using --wsrep-start-position when starting mysqld ...
1919
connection node_1;
20+
SELECT COUNT(*) FROM t1;
21+
COUNT(*)
22+
5
23+
connection node_2;
24+
SET SESSION wsrep_sync_wait = 15;
25+
SELECT COUNT(*) FROM t1;
26+
COUNT(*)
27+
5
2028
include/diff_servers.inc [servers=1 2]
2129
connection node_1;
2230
DROP TABLE t1;
2331
CALL mtr.add_suppression("Skipped GCache ring buffer recovery");
24-
include/assert_grep.inc [IST first seqno 2 not found from cache, falling back to SST]
32+
include/assert_grep.inc [not found from cache, falling back to SST]
2533
connection node_2;
2634
CALL mtr.add_suppression("Skipped GCache ring buffer recovery");

mysql-test/suite/galera/t/galera_gcache_recover_full_gcache.test

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ INSERT INTO t1 (f2) VALUES (REPEAT('x', 1024 * 1024 * 10));
3838
--source include/galera_wait_ready.inc
3939
--let $wait_condition = SELECT VARIABLE_VALUE = 2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME = 'wsrep_cluster_size';
4040

41+
SELECT COUNT(*) FROM t1;
42+
43+
--connection node_2
44+
SET SESSION wsrep_sync_wait = 15;
45+
SELECT COUNT(*) FROM t1;
46+
4147
--let $diff_servers = 1 2
4248
--source include/diff_servers.inc
4349

@@ -48,8 +54,8 @@ DROP TABLE t1;
4854
CALL mtr.add_suppression("Skipped GCache ring buffer recovery");
4955

5056
# Confirm that IST did not take place
51-
--let $assert_text = IST first seqno 2 not found from cache, falling back to SST
52-
--let $assert_select = IST first seqno 2 not found from cache, falling back to SST
57+
--let $assert_text = not found from cache, falling back to SST
58+
--let $assert_select = not found from cache, falling back to SST
5359
--let $assert_count = 1
5460
--let $assert_file = $MYSQLTEST_VARDIR/log/mysqld.1.err
5561
--let $assert_only_after = starting as process

0 commit comments

Comments
 (0)