revision-id: 223ff38cd2ad19727f067869d2824cbada97a8d0 parent(s): 31584c8bb8204b27626fae0127eff4889b8f4383 committer: Sergei Petrunia branch nick: 10.2-r10 timestamp: 2018-05-21 20:25:38 +0300 message: MDEV-16033: rocksdb.deadlock fails in buildbot with timeout Update to recent version of RocksDB to include the fix --- storage/rocksdb/build_rocksdb.cmake | 2 ++ storage/rocksdb/rocksdb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake index c76f711..5478b6b 100644 --- a/storage/rocksdb/build_rocksdb.cmake +++ b/storage/rocksdb/build_rocksdb.cmake @@ -179,6 +179,7 @@ set(ROCKSDB_SOURCES db/internal_stats.cc db/log_reader.cc db/log_writer.cc + db/logs_with_prep_tracker.cc db/malloc_stats.cc db/managed_iterator.cc db/memtable.cc @@ -295,6 +296,7 @@ set(ROCKSDB_SOURCES util/status_message.cc util/string_util.cc util/sync_point.cc + util/sync_point_impl.cc util/testutil.cc util/thread_local.cc util/threadpool_imp.cc diff --git a/storage/rocksdb/rocksdb b/storage/rocksdb/rocksdb index ba295cd..46fde6b 160000 --- a/storage/rocksdb/rocksdb +++ b/storage/rocksdb/rocksdb @@ -1 +1 @@ -Subproject commit ba295cda29daee3ffe58549542804efdfd969784 +Subproject commit 46fde6b65336c5e176d347b80422fd5f6a7ae7c2