Skip to content

Commit

Permalink
SERVER-17492 [RocksDB] Fix RocksDB build, broken by 59a9a04
Browse files Browse the repository at this point in the history
Signed-off-by: Ramon Fernandez <ramon@mongodb.com>
  • Loading branch information
igorcanadi authored and ramonfm committed Mar 9, 2015
1 parent df85a20 commit e8f722a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion jstests/sharding/top_chunk_autosplit.js
Expand Up @@ -312,7 +312,7 @@ var maxSizeTests = [

// Execute all test objects
// SERVER-17070 Auto split moves to shard node running WiredTiger, if exceeding maxSize
var unsupported = ["wiredTiger", "rocksExperiment"];
var unsupported = ["wiredTiger", "RocksDB"];
if (unsupported.indexOf(st.d0.adminCommand({serverStatus : 1}).storageEngine.name) == -1 &&
unsupported.indexOf(st.d1.adminCommand({serverStatus : 1}).storageEngine.name) == -1) {
for (var i = 0; i < maxSizeTests.length; i++) {
Expand Down
3 changes: 2 additions & 1 deletion src/mongo/db/storage/rocks/rocks_record_store.cpp
Expand Up @@ -35,6 +35,7 @@

#include <boost/scoped_array.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread/locks.hpp>
#include <memory>
#include <algorithm>
#include <utility>
Expand Down Expand Up @@ -276,7 +277,7 @@ namespace mongo {
}

// ensure only one thread at a time can do deletes, otherwise they'll conflict.
boost::lock_guard<boost::timed_mutex> lock(_cappedDeleterMutex, boost::defer_lock);
boost::unique_lock<boost::timed_mutex> lock(_cappedDeleterMutex, boost::defer_lock);

if (_cappedMaxDocs != -1) {
lock.lock(); // Max docs has to be exact, so have to check every time.
Expand Down
1 change: 1 addition & 0 deletions src/mongo/db/storage/rocks/rocks_record_store.h
Expand Up @@ -32,6 +32,7 @@
#include <atomic>
#include <boost/scoped_ptr.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread/mutex.hpp>
#include <string>
#include <memory>
#include <vector>
Expand Down
2 changes: 2 additions & 0 deletions src/mongo/db/storage/rocks/rocks_transaction.cpp
Expand Up @@ -35,6 +35,8 @@
#include <memory>
#include <string>

#include <boost/thread/locks.hpp>

// for invariant()
#include "mongo/util/assert_util.h"

Expand Down

0 comments on commit e8f722a

Please sign in to comment.