SERVER-19319 Send setShardVersion command after sharding a collection

The shard collection operation needs to inform the former primary shard
for the database containing this collection that the collection is being
sharded. That way, unsharded operations will be rejected when they come
from mongos instances, which are not yet aware the collection became
sharded.

Also reverts commit 280b8e6c835bab826899a7696a1f5852e1221d53
("SERVER-19319 Temporarily update some tests to run a query after sharding
a collection to force the version to be set")

1 files changed, 15 insertions, 7 deletions

diff --git a/src/mongo/s/SConscript b/src/mongo/s/SConscript
index 1669b744cbe..705f48744c9 100644
--- a/src/mongo/s/SConscript
+++ b/src/mongo/s/SConscript
@@ -32,9 +32,11 @@ env.Library(
     target='common',
     source=[
         'chunk_diff.cpp',
+        'set_shard_version_request.cpp',
     ],
     LIBDEPS=[
         'catalog/catalog_types',
+        '$BUILD_DIR/mongo/client/connection_string',
     ]
 )
 
@@ -49,23 +51,29 @@ env.Library(
 )
 
 env.CppUnitTest(
+    target='chunk_diff_test',
+    source=[
+        'chunk_diff_test.cpp',
+    ],
+    LIBDEPS=[
+        'common',
+    ]
+)
+
+env.CppUnitTest(
     target='chunk_version_test',
     source=[
         'chunk_version_test.cpp',
     ],
     LIBDEPS=[
-        '$BUILD_DIR/mongo/base',
-        '$BUILD_DIR/mongo/client/clientdriver',
-        '$BUILD_DIR/mongo/db/common',
-        '$BUILD_DIR/mongo/db/range_arithmetic',
-        'catalog/catalog_types',
+        'common',
     ]
 )
 
 env.CppUnitTest(
-    target='chunk_diff_test',
+    target='set_shard_version_request_test',
     source=[
-        'chunk_diff_test.cpp',
+        'set_shard_version_request_test.cpp',
     ],
     LIBDEPS=[
         'common',