diff options
| author | Henrik Edin <henrik.edin@mongodb.com> | 2018-02-05 11:36:33 -0500 |
|---|---|---|
| committer | Henrik Edin <henrik.edin@mongodb.com> | 2018-02-08 10:53:11 -0500 |
| commit | 0630b56803ef000012725490526242e97bc879cc (patch) | |
| tree | 5284d629a1bab20e464d2356da4b3827d3cb6179 /src/mongo/db/SConscript | |
| parent | b730e13c75d21ee86fea0622a55410d790a23224 (diff) | |
| download | mongo-0630b56803ef000012725490526242e97bc879cc.tar.gz | |
SERVER-33124 Remove mmapv1 dependency from embedded.
New shim libraries to check fsync write lock and repair database on mmapv1 to break dependency chain.
Diffstat (limited to 'src/mongo/db/SConscript')
| -rw-r--r-- | src/mongo/db/SConscript | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index 442ae9ff8a6..92123979b87 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -611,21 +611,22 @@ env.Library( ], LIBDEPS=[ '$BUILD_DIR/mongo/base', + '$BUILD_DIR/mongo/db/auth/authmongod', + '$BUILD_DIR/mongo/db/concurrency/lock_manager', + '$BUILD_DIR/mongo/db/commands/dcommands_fsync', + '$BUILD_DIR/mongo/db/ops/write_ops_parsers', + '$BUILD_DIR/mongo/db/s/sharding', + '$BUILD_DIR/mongo/db/storage/storage_options', '$BUILD_DIR/mongo/transport/service_entry_point', - 'auth/authmongod', 'command_can_run_here', - 'commands/dcommands_fsync', - 'concurrency/lock_manager', 'curop', 'curop_metrics', 'lasterror', - 'ops/write_ops_parsers', 'rw_concern_d', - 's/sharding', - 'storage/storage_options', ], LIBDEPS_PRIVATE=[ - 'ops/write_ops_exec', + '$BUILD_DIR/mongo/db/ops/write_ops_exec', + '$BUILD_DIR/mongo/db/commands/fsync_locked', ], ) @@ -741,14 +742,17 @@ env.Library( "repair_database.cpp", ], LIBDEPS=[ - "background", - "catalog/index_key_validate", '$BUILD_DIR/mongo/db/catalog/collection', '$BUILD_DIR/mongo/db/catalog/database', - "$BUILD_DIR/mongo/db/storage/mmap_v1/storage_mmapv1", + '$BUILD_DIR/mongo/db/storage/mmap_v1/repair_database_interface', + 'background', ], LIBDEPS_PRIVATE=[ - "$BUILD_DIR/mongo/db/repl/oplog", + '$BUILD_DIR/mongo/db/catalog/document_validation', + '$BUILD_DIR/mongo/db/catalog/index_create', + '$BUILD_DIR/mongo/db/catalog/index_key_validate', + '$BUILD_DIR/mongo/db/repl/oplog', + '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface', ], ) @@ -758,11 +762,14 @@ env.Library( "ttl.cpp", ], LIBDEPS=[ - "commands/dcommands_fsync", - "db_raii", - "query_exec", - "ttl_collection_cache", + 'db_raii', + 'query_exec', + 'ttl_collection_cache', ], + LIBDEPS_PRIVATE=[ + '$BUILD_DIR/mongo/db/commands/fsync_locked', + 'write_ops', + ] ) env.Library( |