SERVER-27586 Add some missing edges to build graph

This also remove an incompletes tag on libraries which are now fully
resolved.

5 files changed, 22 insertions, 16 deletions

diff --git a/src/mongo/db/query/SConscript b/src/mongo/db/query/SConscript
index e1d369726f1..7274f81124f 100644
--- a/src/mongo/db/query/SConscript
+++ b/src/mongo/db/query/SConscript
@@ -77,12 +77,13 @@ env.Library(
         "$BUILD_DIR/mongo/db/curop",
         "$BUILD_DIR/mongo/db/exec/exec",
         "$BUILD_DIR/mongo/db/s/sharding",
+        "$BUILD_DIR/mongo/db/storage/oplog_hack",
+        "$BUILD_DIR/mongo/util/elapsed_tracker",
     ],
     LIBDEPS_TAGS=[
-        # Depends on files from serverOnlyFiles, and has many other
-        # missing dependencies.
+        # Has direct and indirect circular dependencies with the catalog components.
         'incomplete',
-    ]
+    ],
 )
 
 # Shared mongod/mongos query code.
diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript
index dfbce3752df..04c37d1486b 100644
--- a/src/mongo/db/s/SConscript
+++ b/src/mongo/db/s/SConscript
@@ -71,15 +71,22 @@ env.Library(
         '$BUILD_DIR/mongo/base',
         '$BUILD_DIR/mongo/bson/util/bson_extract',
         '$BUILD_DIR/mongo/db/common',
-        '$BUILD_DIR/mongo/s/sharding_initialization',
+        '$BUILD_DIR/mongo/db/range_deleter',
+        '$BUILD_DIR/mongo/db/rw_concern_d',
+        '$BUILD_DIR/mongo/db/concurrency/lock_manager',
+        '$BUILD_DIR/mongo/db/query/internal_plans',
+        '$BUILD_DIR/mongo/db/repl/repl_coordinator_impl',
+        '$BUILD_DIR/mongo/s/client/shard_local',
+        '$BUILD_DIR/mongo/s/coreshard',
         '$BUILD_DIR/mongo/s/is_mongos',
+        '$BUILD_DIR/mongo/s/sharding_initialization',
+        '$BUILD_DIR/mongo/util/elapsed_tracker',
         'metadata',
         'migration_types',
         'type_shard_identity',
     ],
     LIBDEPS_TAGS=[
-        # Depends on symbols defined in files in serverOnlyFiles, and has
-        # many other missing dependencies.
+        # Depends on parts of catalog.
         'incomplete',
     ],
 )
diff --git a/src/mongo/db/storage/mmap_v1/SConscript b/src/mongo/db/storage/mmap_v1/SConscript
index 6f262a71a46..2747473adfb 100644
--- a/src/mongo/db/storage/mmap_v1/SConscript
+++ b/src/mongo/db/storage/mmap_v1/SConscript
@@ -43,7 +43,9 @@ env.Library(
         'compress',
         '$BUILD_DIR/mongo/db/catalog/collection_options',
         '$BUILD_DIR/mongo/db/commands',
+        '$BUILD_DIR/mongo/db/commands/core',
         '$BUILD_DIR/mongo/db/concurrency/lock_manager',
+        '$BUILD_DIR/mongo/db/diag_log',
         '$BUILD_DIR/mongo/db/index_names',
         '$BUILD_DIR/mongo/db/index/index_descriptor',
         '$BUILD_DIR/mongo/db/storage/journal_listener',
@@ -51,10 +53,10 @@ env.Library(
         '$BUILD_DIR/mongo/db/storage/storage_engine_lock_file',
     ],
     LIBDEPS_TAGS=[
-        # Many undefined symbols
+        # Depends upon parts of catalog which form a cycle.
         'incomplete',
     ],
-    )
+)
 
 compressEnv = env.Clone()
 compressEnv.InjectThirdPartyIncludePaths(libraries=['snappy'])
diff --git a/src/mongo/db/storage/wiredtiger/SConscript b/src/mongo/db/storage/wiredtiger/SConscript
index 4fe3322a14a..cc95490afea 100644
--- a/src/mongo/db/storage/wiredtiger/SConscript
+++ b/src/mongo/db/storage/wiredtiger/SConscript
@@ -79,14 +79,11 @@ if wiredtiger:
             ],
         LIBDEPS=['storage_wiredtiger_core',
                  'storage_wiredtiger_customization_hooks',
+                 '$BUILD_DIR/mongo/db/db_raii',
                  '$BUILD_DIR/mongo/db/storage/kv/kv_engine',
                  '$BUILD_DIR/mongo/db/storage/storage_engine_lock_file',
                  '$BUILD_DIR/mongo/db/storage/storage_engine_metadata',
                  ],
-        LIBDEPS_TAGS=[
-            # Depends on symbols defined in serverOnlyfiles
-            'incomplete',
-        ],
         )
 
     wtEnv.Library(
diff --git a/src/mongo/dbtests/SConscript b/src/mongo/dbtests/SConscript
index c2de92ab9a3..d3d1dfdfe8b 100644
--- a/src/mongo/dbtests/SConscript
+++ b/src/mongo/dbtests/SConscript
@@ -24,16 +24,15 @@ env.Library(
         'framework_options_init.cpp',
     ],
     LIBDEPS=[
+        '$BUILD_DIR/mongo/db/dbdirectclient',
         '$BUILD_DIR/mongo/db/op_observer_noop',
+        '$BUILD_DIR/mongo/db/service_context_d',
         '$BUILD_DIR/mongo/db/s/sharding',
         '$BUILD_DIR/mongo/s/coreshard',
+        '$BUILD_DIR/mongo/scripting/scripting_common',
         '$BUILD_DIR/mongo/unittest/unittest',
         'framework_options',
     ],
-    LIBDEPS_TAGS=[
-        # Depends on service_context_d.cpp which is in serveronly
-        'incomplete',
-    ],
 )
 
 env.Library(