diff options
| author | Eliot Horowitz <eliot@10gen.com> | 2014-12-16 12:13:50 -0500 |
|---|---|---|
| committer | Eliot Horowitz <eliot@10gen.com> | 2014-12-16 12:14:13 -0500 |
| commit | c084a108e440222f458880e816e3cd1091fccf1d (patch) | |
| tree | 53324e9a290b517e539f3632ea2315ac4ab10c7e /src | |
| parent | d061b19c0bfc48a5a7e16d328919945f952c3e9f (diff) | |
| download | mongo-c084a108e440222f458880e816e3cd1091fccf1d.tar.gz | |
SERVER-16519: fix linking of WriteConflictException
Diffstat (limited to 'src')
| -rw-r--r-- | src/mongo/db/commands/parameters.cpp | 7 | ||||
| -rw-r--r-- | src/mongo/db/concurrency/SConscript | 4 | ||||
| -rw-r--r-- | src/mongo/db/concurrency/write_conflict_exception.cpp | 10 | ||||
| -rw-r--r-- | src/mongo/db/storage/wiredtiger/SConscript | 1 |
4 files changed, 14 insertions, 8 deletions
diff --git a/src/mongo/db/commands/parameters.cpp b/src/mongo/db/commands/parameters.cpp index d657f3b142b..9d864b26eb4 100644 --- a/src/mongo/db/commands/parameters.cpp +++ b/src/mongo/db/commands/parameters.cpp @@ -38,7 +38,6 @@ #include "mongo/db/auth/authorization_manager.h" #include "mongo/db/auth/internal_user_auth.h" #include "mongo/db/commands.h" -#include "mongo/db/concurrency/write_conflict_exception.h" #include "mongo/db/server_parameters.h" #include "mongo/db/storage_options.h" #include "mongo/logger/parse_log_component_settings.h" @@ -588,12 +587,6 @@ namespace mongo { false, // allowedToChangeAtStartup true); // allowedToChangeAtRuntime - // for WriteConflictException - ExportedServerParameter<bool> TraceWCExceptionsSetting(ServerParameterSet::getGlobal(), - "traceWriteConflictExceptions", - &WriteConflictException::trace, - false, // allowedToChangeAtStartup - true); // allowedToChangeAtRuntime } diff --git a/src/mongo/db/concurrency/SConscript b/src/mongo/db/concurrency/SConscript index fbd66bf4f85..145f0dde257 100644 --- a/src/mongo/db/concurrency/SConscript +++ b/src/mongo/db/concurrency/SConscript @@ -7,7 +7,9 @@ env.Library( source=[ 'write_conflict_exception.cpp' ], - LIBDEPS=[] + LIBDEPS=[ + '$BUILD_DIR/mongo/server_parameters' + ] ) env.Library( diff --git a/src/mongo/db/concurrency/write_conflict_exception.cpp b/src/mongo/db/concurrency/write_conflict_exception.cpp index 7e6e9d08c75..81913bd2dd6 100644 --- a/src/mongo/db/concurrency/write_conflict_exception.cpp +++ b/src/mongo/db/concurrency/write_conflict_exception.cpp @@ -31,6 +31,7 @@ #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrite #include "mongo/db/concurrency/write_conflict_exception.h" +#include "mongo/db/server_parameters.h" #include "mongo/util/log.h" #include "mongo/util/stacktrace.h" @@ -72,4 +73,13 @@ namespace mongo { } + namespace { + // for WriteConflictException + ExportedServerParameter<bool> TraceWCExceptionsSetting(ServerParameterSet::getGlobal(), + "traceWriteConflictExceptions", + &WriteConflictException::trace, + false, // allowedToChangeAtStartup + true); // allowedToChangeAtRuntime + } + } diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript index 611451d1d6c..d7966a083e4 100644 --- a/src/mongo/db/storage/wiredtiger/SConscript +++ b/src/mongo/db/storage/wiredtiger/SConscript @@ -21,6 +21,7 @@ if wiredtiger: LIBDEPS= [ '$BUILD_DIR/mongo/bson', '$BUILD_DIR/mongo/db/catalog/collection_options', + '$BUILD_DIR/mongo/db/concurrency/write_conflict_exception', '$BUILD_DIR/mongo/db/index/index_descriptor', '$BUILD_DIR/mongo/db/storage/index_entry_comparison', '$BUILD_DIR/mongo/db/storage/oplog_hack', |