MDEV-14562: rocksdb.bloomfilter failed in buildbot

Bloom filter is only used when reading the data from disk. If the data
happens to be still in the memtable, bloomfilter wont be used.

Stabilize the testcase by making sure the data is on disk before we
read it.

4 files changed, 11 insertions, 1 deletions

diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter.result b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter.result
index 5f1083a1bb2..bc5d685f89b 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter.result
@@ -43,6 +43,7 @@ insert t1
 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
   from seq_1_to_10000;
 insert t2 select * from t1;
+set global rocksdb_force_flush_memtable_now=1;
 call bloom_start();
 select count(*) from t1;
 count(*)
@@ -443,6 +444,7 @@ insert t1
 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
   from seq_1_to_10000;
 insert t2 select * from t1;
+set global rocksdb_force_flush_memtable_now=1;
 call bloom_start();
 select count(*) from t1;
 count(*)
@@ -843,6 +845,7 @@ insert t1
 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
   from seq_1_to_10000;
 insert t2 select * from t1;
+set global rocksdb_force_flush_memtable_now=1;
 call bloom_start();
 select count(*) from t1;
 count(*)
@@ -1243,6 +1246,7 @@ insert t1
 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
   from seq_1_to_10000;
 insert t2 select * from t1;
+set global rocksdb_force_flush_memtable_now=1;
 call bloom_start();
 select count(*) from t1;
 count(*)
@@ -1643,6 +1647,7 @@ insert t1
 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
   from seq_1_to_10000;
 insert t2 select * from t1;
+set global rocksdb_force_flush_memtable_now=1;
 call bloom_start();
 select count(*) from t1;
 count(*)
diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter_skip.result b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter_skip.result
index 2496f349427..28475630564 100644
--- a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter_skip.result
+++ b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter_skip.result
@@ -43,6 +43,7 @@ insert t1
 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
   from seq_1_to_10000;
 insert t2 select * from t1;
+set global rocksdb_force_flush_memtable_now=1;
 call bloom_start();
 select count(*) from t1;
 count(*)
@@ -443,6 +444,7 @@ insert t1
 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
   from seq_1_to_10000;
 insert t2 select * from t1;
+set global rocksdb_force_flush_memtable_now=1;
 call bloom_start();
 select count(*) from t1;
 count(*)
@@ -843,6 +845,7 @@ insert t1
 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
   from seq_1_to_10000;
 insert t2 select * from t1;
+set global rocksdb_force_flush_memtable_now=1;
 call bloom_start();
 select count(*) from t1;
 count(*)
@@ -1243,6 +1246,7 @@ insert t1
 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
   from seq_1_to_10000;
 insert t2 select * from t1;
+set global rocksdb_force_flush_memtable_now=1;
 call bloom_start();
 select count(*) from t1;
 count(*)
@@ -1643,6 +1647,7 @@ insert t1
 select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
   from seq_1_to_10000;
 insert t2 select * from t1;
+set global rocksdb_force_flush_memtable_now=1;
 call bloom_start();
 select count(*) from t1;
 count(*)
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/bloomfilter_load_select.inc b/storage/rocksdb/mysql-test/rocksdb/t/bloomfilter_load_select.inc
index 5c122d6bd19..cf8b26847f0 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/bloomfilter_load_select.inc
+++ b/storage/rocksdb/mysql-test/rocksdb/t/bloomfilter_load_select.inc
@@ -5,6 +5,7 @@ insert t1
   select (seq+9) div 10, (seq+4) div 5, (seq+4) div 5, seq, seq, 1000, "aaabbbccc"
   from seq_1_to_10000;
 insert t2 select * from t1;
+set global rocksdb_force_flush_memtable_now=1;
 
 # BF conditions (prefix short(4B)|medium(20B)|long(240B))
 #0 no eq condition (o, x, x)
diff --git a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
index 212e09ce2ff..60f658ec7e1 100644
--- a/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
+++ b/storage/rocksdb/mysql-test/rocksdb/t/disabled.def
@@ -68,7 +68,6 @@ rpl_row_triggers : Requires read-free slave.
 compact_deletes: MDEV-12663 : rocksdb.compact_deletes times out and causes other tests to fail
 blind_delete_without_tx_api: MDEV-12286: rocksdb.blind_delete_without_tx_api test fails
 information_schema: MDEV-14372: unstable testcase
-bloomfilter: MDEV-14562
 
 ##
 ## Tests that fail for some other reason