SERVER-30815 The db/serveronly library no longer exports library edges

9 files changed, 23 insertions, 1 deletions

diff --git a/src/mongo/SConscript b/src/mongo/SConscript
index 51d702962f0..9a53426ed70 100644
--- a/src/mongo/SConscript
+++ b/src/mongo/SConscript
@@ -316,6 +316,7 @@ env.Library(
         'db/query_exec',
         'db/repair_database',
         'db/repair_database_and_check_version',
+        'db/repl/repl_coordinator_impl',
         'db/repl/repl_set_commands',
         'db/repl/storage_interface_impl',
         'db/repl/topology_coordinator',
diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript
index 2dac5cbc802..d327b38f363 100644
--- a/src/mongo/db/SConscript
+++ b/src/mongo/db/SConscript
@@ -133,6 +133,7 @@ env.CppUnitTest(
         'auth/authmocks',
         'common',
         'op_observer_d',
+        'repl/oplog_interface_local',
         'repl/replmocks',
         'service_context_d_test_fixture',
     ],
@@ -1063,7 +1064,9 @@ env.Library(
         # See the additional comments in instance.cpp for details.
         'instance.cpp'
     ],
-    LIBDEPS=[
+    LIBDEPS_PRIVATE=[
+        # DO NOT ADD ADDITIONAL FILES TO THIS LIST.
+        # This list should be gradually becoming empty.
         "$BUILD_DIR/mongo/db/bson/dotted_path_support",
         "$BUILD_DIR/mongo/db/logical_time_metadata_hook",
         "$BUILD_DIR/mongo/db/ttl_collection_cache",
diff --git a/src/mongo/db/catalog/SConscript b/src/mongo/db/catalog/SConscript
index 826f6302a2c..05ce3036ad4 100644
--- a/src/mongo/db/catalog/SConscript
+++ b/src/mongo/db/catalog/SConscript
@@ -152,6 +152,7 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/namespace_string',
         '$BUILD_DIR/mongo/db/op_observer_d',
+        '$BUILD_DIR/mongo/db/repl/drop_pending_collection_reaper',
         '$BUILD_DIR/mongo/db/repl/optime',
         '$BUILD_DIR/mongo/db/repl/repl_coordinator_interface',
         '$BUILD_DIR/mongo/db/repl/replmocks',
@@ -366,6 +367,7 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/db/auth/authmocks',
         '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/namespace_string',
+        '$BUILD_DIR/mongo/db/op_observer',
         '$BUILD_DIR/mongo/db/repl/drop_pending_collection_reaper',
         '$BUILD_DIR/mongo/db/repl/oplog',
         '$BUILD_DIR/mongo/db/repl/optime',
@@ -385,6 +387,7 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/db/auth/authmocks',
         '$BUILD_DIR/mongo/db/db_raii',
         '$BUILD_DIR/mongo/db/namespace_string',
+        '$BUILD_DIR/mongo/db/op_observer',
         '$BUILD_DIR/mongo/db/repl/drop_pending_collection_reaper',
         '$BUILD_DIR/mongo/db/repl/oplog',
         '$BUILD_DIR/mongo/db/repl/optime',
diff --git a/src/mongo/db/ops/SConscript b/src/mongo/db/ops/SConscript
index b7428b32608..4c1d43b1e5f 100644
--- a/src/mongo/db/ops/SConscript
+++ b/src/mongo/db/ops/SConscript
@@ -73,5 +73,6 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/db/query_exec',
         '$BUILD_DIR/mongo/db/repl/mock_repl_coord_server_fixture',
         '$BUILD_DIR/mongo/db/repl/oplog_entry',
+        '$BUILD_DIR/mongo/db/write_ops',
     ],
 )
diff --git a/src/mongo/db/repl/SConscript b/src/mongo/db/repl/SConscript
index a5f66564955..98d1cee071f 100644
--- a/src/mongo/db/repl/SConscript
+++ b/src/mongo/db/repl/SConscript
@@ -95,9 +95,11 @@ env.CppUnitTest(
     LIBDEPS=[
         'oplog',
         'oplog_entry',
+        'oplog_interface_local',
         'replmocks',
         'storage_interface_impl',
         '$BUILD_DIR/mongo/db/auth/authmocks',
+        '$BUILD_DIR/mongo/db/op_observer_d',
         '$BUILD_DIR/mongo/db/service_context_d_test_fixture',
         '$BUILD_DIR/mongo/rpc/command_status',
     ],
@@ -568,6 +570,7 @@ env.Library(
         'oplog_interface_mock',
         'optime',
         'replication_process',
+        'replication_recovery',
         'replmocks',
         'rs_rollback',
         'storage_interface_impl',
@@ -617,6 +620,7 @@ env.CppUnitTest(
         'rollback_impl_test.cpp',
     ],
     LIBDEPS=[
+        'oplog_interface_local',
         'oplog_interface_mock',
         'rollback_impl',
         'rollback_test_fixture',
@@ -704,6 +708,7 @@ env.Library(
         'sync_tail_test_fixture.cpp',
     ],
     LIBDEPS=[
+        'drop_pending_collection_reaper',
         'oplog_application',
         'replmocks',
         'storage_interface_impl',
@@ -1620,7 +1625,10 @@ env.Library(
     ],
     LIBDEPS=[
         'oplog',
+        'oplog_entry',
         'replmocks',
+        '$BUILD_DIR/mongo/db/catalog_raii',
+        '$BUILD_DIR/mongo/db/dbdirectclient',
         '$BUILD_DIR/mongo/db/service_context_d_test_fixture',
     ]
 )
diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript
index 4f256b99eae..2d136b0cff3 100644
--- a/src/mongo/db/s/SConscript
+++ b/src/mongo/db/s/SConscript
@@ -365,6 +365,7 @@ env.CppUnitTest(
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/auth/authmocks',
         '$BUILD_DIR/mongo/db/repl/mock_repl_coord_server_fixture',
+        'sharding_runtime_d',
     ]
 )
 
diff --git a/src/mongo/db/storage/SConscript b/src/mongo/db/storage/SConscript
index 9c5bee08173..c67c897dbd7 100644
--- a/src/mongo/db/storage/SConscript
+++ b/src/mongo/db/storage/SConscript
@@ -268,6 +268,7 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/db/auth/authmocks',
+        '$BUILD_DIR/mongo/db/dbhelpers',
         '$BUILD_DIR/mongo/db/namespace_string',
         '$BUILD_DIR/mongo/db/repair_database',
         '$BUILD_DIR/mongo/db/repl/replmocks',
diff --git a/src/mongo/dbtests/SConscript b/src/mongo/dbtests/SConscript
index 1b66fc11627..f604a3310c3 100644
--- a/src/mongo/dbtests/SConscript
+++ b/src/mongo/dbtests/SConscript
@@ -129,11 +129,14 @@ dbtest = env.Program(
         "$BUILD_DIR/mongo/db/repl/drop_pending_collection_reaper",
         "$BUILD_DIR/mongo/db/repl/repl_coordinator_interface",
         "$BUILD_DIR/mongo/db/repl/replication_consistency_markers_impl",
+        "$BUILD_DIR/mongo/db/repl/replication_recovery",
         "$BUILD_DIR/mongo/db/repl/replmocks",
+        "$BUILD_DIR/mongo/db/repl/serveronly_repl",
         "$BUILD_DIR/mongo/db/repl/storage_interface_impl",
         "$BUILD_DIR/mongo/db/serveronly",
         "$BUILD_DIR/mongo/db/sessions_collection_standalone",
         "$BUILD_DIR/mongo/db/storage/kv/kv_engine_core",
+        "$BUILD_DIR/mongo/db/storage/kv/kv_storage_engine",
         "$BUILD_DIR/mongo/transport/transport_layer_manager",
         "$BUILD_DIR/mongo/util/clock_source_mock",
         "$BUILD_DIR/mongo/util/net/network",
diff --git a/src/mongo/s/client/SConscript b/src/mongo/s/client/SConscript
index 5dbae27a390..dd5d19ca9bb 100644
--- a/src/mongo/s/client/SConscript
+++ b/src/mongo/s/client/SConscript
@@ -89,6 +89,7 @@ env.CppUnitTest(
         '$BUILD_DIR/mongo/db/auth/authmocks',
         '$BUILD_DIR/mongo/db/repl/replmocks',
         '$BUILD_DIR/mongo/db/service_context_d_test_fixture',
+        '$BUILD_DIR/mongo/s/grid',
         'shard_local',
     ],
 )