revision-id: 9f9ab80dbf7dd33f45cd25187c8788d622251e10 parent(s): 16a8a241c297a4ae683523e68518aa85a129daea committer: Sergei Petrunia branch nick: 10.2-r11 timestamp: 2018-05-14 19:50:21 +0300 message: 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. --- storage/rocksdb/mysql-test/rocksdb/r/bloomfilter.result | 5 +++++ storage/rocksdb/mysql-test/rocksdb/r/bloomfilter_skip.result | 5 +++++ storage/rocksdb/mysql-test/rocksdb/t/bloomfilter_load_select.inc | 1 + storage/rocksdb/mysql-test/rocksdb/t/disabled.def | 1 - 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter.result b/storage/rocksdb/mysql-test/rocksdb/r/bloomfilter.result index 5f1083a..bc5d685 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 2496f34..2847563 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 5c122d6..cf8b268 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 212e09c..60f658e 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