Revert "SERVER-11332 multi host query from fastest host using thread pools"

This reverts commit 03f0d9c

Author: benety

src/mongo/SConscript

@@ -713,7 +713,7 @@ env.Library('coreshard', ['s/distlock.cpp',
                           's/shard.cpp',
                           's/shardkey.cpp'],
             LIBDEPS=['s/base',
-                     's/cluster_ops_impl']);
+                     's/cluster_op_impl']);
 
 mongosLibraryFiles = [
     "s/interrupt_status_mongos.cpp",
@@ -742,7 +742,7 @@ env.Library( "mongoscore",
              LIBDEPS=['db/auth/authmongos',
                       'db/fts/ftsmongos',
                       'db/query/lite_parsed_query',
-                      's/cluster_ops',
+                      's/cluster_write_ops',
                       's/cluster_write_op_conversion',
                       's/upgrade',
                      ] )
@@ -1057,8 +1057,8 @@ test = testEnv.Install(
                        "testframework",
                        "gridfs",
                        "s/upgrade",
-                       "s/cluster_ops",
-                       "s/cluster_ops_impl",
+                       "s/cluster_write_ops",
+                       "s/cluster_op_impl",
                        "mocklib",
                        "db/exec/mock_stage",
                        "$BUILD_DIR/mongo/db/auth/authmocks",

src/mongo/base/error_codes.err

@@ -88,7 +88,6 @@ error_code("IndexOptionsConflict", 85 )
 error_code("IndexKeySpecsConflict", 86 )
 error_code("CannotSplit", 87)
 error_code("SplitFailed", 88)
-error_code("NetworkTimeout", 89)
 
 # Non-sequential error codes (for compatibility only)
 error_code("NotMaster", 10107) #this comes from assert_util.h
@@ -100,7 +99,7 @@ error_code("KeyTooLong", 17280);
 error_code("BackgroundOperationInProgressForDatabase", 12586);
 error_code("BackgroundOperationInProgressForNamespace", 12587);
 
-error_class("NetworkError", ["HostUnreachable", "HostNotFound", "NetworkTimeout"])
+error_class("NetworkError", ["HostUnreachable", "HostNotFound"])
 error_class("Interruption", ["Interrupted", "InterruptedAtShutdown", "ExceededTimeLimit"])
 error_class("IndexCreationError", ["CannotCreateIndex", "IndexOptionsConflict", 
                                    "IndexKeySpecsConflict", "IndexAlreadyExists"])

src/mongo/s/SConscript

@@ -207,25 +207,18 @@ env.CppUnitTest(
     ]
 )
 
-#
-# State and execution of operations across multiple hosts
-#
-# This functionality is self-contained and independent of any network or system-level
-# code.
-#
+# Cluster write op state and execution
 env.Library(
-    target='cluster_ops',
+    target='cluster_write_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'
     ],
 )
 
@@ -236,7 +229,7 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         'base',
-        'cluster_ops',
+        'cluster_write_ops',
         '$BUILD_DIR/mongo/db/common',
     ]
 )
@@ -248,7 +241,7 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         'base',
-        'cluster_ops',
+        'cluster_write_ops',
         '$BUILD_DIR/mongo/db/common',
     ]
 )
@@ -260,7 +253,7 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         'base',
-        'cluster_ops',
+        'cluster_write_ops',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/clientdriver',
     ],
@@ -273,20 +266,7 @@ env.CppUnitTest(
     ],
     LIBDEPS=[
         'base',
-        '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',
+        'cluster_write_ops',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/clientdriver',
     ],
@@ -301,7 +281,7 @@ env.Library(
     ],
     LIBDEPS=[
         '$BUILD_DIR/mongo/bson',
-        'cluster_ops',
+        'cluster_write_ops',
         '$BUILD_DIR/mongo/db/common', # for Message
     ],
 )
@@ -312,7 +292,7 @@ env.CppUnitTest(
         'write_ops/batch_upconvert_test.cpp',
     ],
     LIBDEPS=[
-        'cluster_ops',
+        'cluster_write_ops',
         'cluster_write_op_conversion',
         '$BUILD_DIR/mongo/db/common',
         '$BUILD_DIR/mongo/server_options', # DbMessage needs server options
@@ -325,21 +305,16 @@ env.CppUnitTest(
         'write_ops/batch_downconvert_test.cpp',
     ],
     LIBDEPS=[
-        'cluster_ops',
+        'cluster_write_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_ops_impl',
+    target='cluster_op_impl',
     source=[
         'chunk_manager_targeter.cpp',
         'cluster_write.cpp',
@@ -350,7 +325,7 @@ env.Library(
     LIBDEPS=[
         '$BUILD_DIR/mongo/bson',
         'batch_write_types',
-        'cluster_ops',
+        'cluster_write_ops',
         'cluster_write_op_conversion',
     ],
 )