revision-id: 562dd53c290e0ef361976c679bc569a64d098625 parent(s): ba10ffe0f4c94c0fd2b1e42615a0c8d1a7f88ab9 committer: Sergei Petrunia branch nick: 10.2-r11 timestamp: 2018-08-13 18:56:52 +0300 message: MDEV-16575: rocksdb.bulk_load_errors fails in buildbot with wrong result Fix a race condition in the test. --- storage/rocksdb/mysql-test/rocksdb/t/bulk_load_errors.test | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/storage/rocksdb/mysql-test/rocksdb/t/bulk_load_errors.test b/storage/rocksdb/mysql-test/rocksdb/t/bulk_load_errors.test index 1e349d0..3f08526 100644 --- a/storage/rocksdb/mysql-test/rocksdb/t/bulk_load_errors.test +++ b/storage/rocksdb/mysql-test/rocksdb/t/bulk_load_errors.test @@ -60,6 +60,13 @@ SELECT * FROM t1; --source include/wait_until_count_sessions.inc +# Note: in MariaDB, session count will be decremented *before* +# myrocks::rocksdb_close_connection is called. This causes a race condition: +# we may grep the error log before bulk load is finalized. +# To prevent that, do a soft restart of the server (I wasnt able to find +# any other reliable way) +--source include/restart_mysqld_with_option.inc + --let SEARCH_FILE=$LOG2 --let SEARCH_PATTERN=RocksDB: Error [0-9]+ finalizing last SST file while disconnecting --source include/search_pattern_in_file.inc