1 files changed, 36 insertions, 11 deletions
diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript
index 2c15f24a1e2..09d30c9169a 100644
--- a/src/mongo/s/SConscript
+++ b/src/mongo/s/SConscript
@@ -207,18 +207,25 @@ env.CppUnitTest(
     ]
 )
 
-# Cluster write op state and execution
+#
+# State and execution of operations across multiple hosts
+#
+# This functionality is self-contained and independent of any network or system-level
+# code.
+#
 env.Library(
-    target='cluster_write_ops',
+    target='cluster_ops',
     source=[
         'write_ops/write_op.cpp',
         'write_ops/batch_write_op.cpp',
         'write_ops/batch_write_exec.cpp',
         'write_ops/config_coordinator.cpp',
+        'multi_host_query.cpp'
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/bson',
         'batch_write_types',
+        '$BUILD_DIR/mongo/synchronization'
     ],
 )
 
@@ -229,7 +236,7 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         'base',
-        'cluster_write_ops',
+        'cluster_ops',
         '$BUILD_DIR/mongo/db/common',
     ]
 )
@@ -241,7 +248,7 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         'base',
-        'cluster_write_ops',
+        'cluster_ops',
         '$BUILD_DIR/mongo/db/common',
     ]
 )
@@ -253,7 +260,7 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         'base',
-        'cluster_write_ops',
+        'cluster_ops',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/clientdriver',
     ],
@@ -266,7 +273,20 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         'base',
-        'cluster_write_ops',
+        'cluster_ops',
+        '$BUILD_DIR/mongo/db/common',
+        '$BUILD_DIR/mongo/clientdriver',
+    ],
+)
+
+env.CppUnitTest(
+    target='multi_host_query_test',
+    source=[
+        'multi_host_query_test.cpp',
+    ],
+    LIBDEPS=[
+        'base',
+        'cluster_ops',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/clientdriver',
     ],
@@ -281,7 +301,7 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/bson',
-        'cluster_write_ops',
+        'cluster_ops',
         '$BUILD_DIR/mongo/db/common', # for Message
     ],
 )
@@ -292,7 +312,7 @@ env.CppUnitTest(
         'write_ops/batch_upconvert_test.cpp',
     ],
     LIBDEPS=[
-        'cluster_write_ops',
+        'cluster_ops',
         'cluster_write_op_conversion',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/server_options', # DbMessage needs server options
@@ -305,16 +325,21 @@ env.CppUnitTest(
         'write_ops/batch_downconvert_test.cpp',
     ],
     LIBDEPS=[
-        'cluster_write_ops',
+        'cluster_ops',
         'cluster_write_op_conversion',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/server_options', # DbMessage needs server options
     ]
 )
 
+#
 # Implementations of components to perform cluster operations in mongos
+#
+# This is the glue code implementing the interfaces required by cluster ops
+# in particular environments.
+#
 env.Library(
-    target='cluster_op_impl',
+    target='cluster_ops_impl',
     source=[
         'chunk_manager_targeter.cpp',
         'cluster_write.cpp',
@@ -325,7 +350,7 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/bson',
         'batch_write_types',
-        'cluster_write_ops',
+        'cluster_ops',
         'cluster_write_op_conversion',
     ],
 )