diff options
Diffstat (limited to 'src/mongo/db/storage')
4 files changed, 20 insertions, 4 deletions
diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript index eb04f974fb5..8f7b2f1e731 100644 --- a/src/mongo/db/storage/SConscript +++ b/src/mongo/db/storage/SConscript @@ -32,7 +32,7 @@ env.Library( 'snapshot_helper.cpp', ], LIBDEPS_PRIVATE=[ - '$BUILD_DIR/mongo/db/concurrency/lock_manager', + '$BUILD_DIR/mongo/db/concurrency/lock_manager_defs', '$BUILD_DIR/mongo/db/repl/read_concern_args', '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', '$BUILD_DIR/mongo/db/server_base', diff --git a/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper_test.cpp b/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper_test.cpp index f0cbd2a0795..9b36ac2afd9 100644 --- a/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper_test.cpp +++ b/src/mongo/db/storage/kv/kv_drop_pending_ident_reaper_test.cpp @@ -27,6 +27,11 @@ * it in the license file. */ +#include "mongo/platform/basic.h" + +#include <memory> + +#include "mongo/db/concurrency/lock_state.h" #include "mongo/db/service_context_test_fixture.h" #include "mongo/db/storage/ident.h" #include "mongo/db/storage/kv/kv_drop_pending_ident_reaper.h" diff --git a/src/mongo/db/storage/storage_engine_init.cpp b/src/mongo/db/storage/storage_engine_init.cpp index 76e88753b2b..6e2b2e23eec 100644 --- a/src/mongo/db/storage/storage_engine_init.cpp +++ b/src/mongo/db/storage/storage_engine_init.cpp @@ -27,13 +27,17 @@ * it in the license file. */ + +#include "mongo/platform/basic.h" + #include "mongo/db/storage/storage_engine_init.h" #include <map> +#include <memory> #include "mongo/base/init.h" #include "mongo/bson/bsonobjbuilder.h" -#include "mongo/db/concurrency/locker_impl.h" +#include "mongo/db/concurrency/lock_state.h" #include "mongo/db/operation_context.h" #include "mongo/db/storage/control/storage_control.h" #include "mongo/db/storage/execution_control/concurrency_adjustment_parameters_gen.h" @@ -55,7 +59,9 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kStorage + namespace mongo { + namespace { /** * Creates the lock file used to prevent concurrent processes from accessing the data files, diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp index 888935ca7e4..068e6d15098 100644 --- a/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp +++ b/src/mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.cpp @@ -27,11 +27,15 @@ * it in the license file. */ -#include "mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.h" -#include "mongo/db/concurrency/locker.h" +#include "mongo/platform/basic.h" + +#include <cstring> + +#include "mongo/db/concurrency/lock_state.h" #include "mongo/db/repl/replication_coordinator.h" #include "mongo/db/storage/wiredtiger/wiredtiger_kv_engine.h" +#include "mongo/db/storage/wiredtiger/wiredtiger_oplog_manager.h" #include "mongo/db/storage/wiredtiger/wiredtiger_util.h" #include "mongo/logv2/log.h" #include "mongo/platform/mutex.h" @@ -40,6 +44,7 @@ #define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kStorage + namespace mongo { MONGO_FAIL_POINT_DEFINE(WTPauseOplogVisibilityUpdateLoop); |