Revert "SERVER-19855 Use ShardConnection for migrations and splits"

This reverts commit fdc2aec174d2facc5edeacd2b7f4c078836f1dfb.

1 files changed, 13 insertions, 17 deletions

diff --git a/jstests/sharding/hash_shard_num_chunks.js b/jstests/sharding/hash_shard_num_chunks.js
index 01b140f1583..608e7c7674c 100644
--- a/jstests/sharding/hash_shard_num_chunks.js
+++ b/jstests/sharding/hash_shard_num_chunks.js
@@ -1,24 +1,21 @@
 // Hash sharding with initial chunk count set.
-// @tags: [ hashed ]
-
-(function() {
-
-var s = new ShardingTest({ shards: 3, mongos: 1, verbose: 1 });
-s.stopBalancer();
+// @tags : [ hashed ]
 
+var s = new ShardingTest({ shards : 3, mongos : 1, verbose : 1 });
 var dbname = "test";
 var coll = "foo";
 var db = s.getDB(dbname);
-
-assert.commandWorked(db.adminCommand({ enablesharding: dbname }));
+db.adminCommand({ enablesharding : dbname });
 s.ensurePrimaryShard(dbname, 'shard0001');
 
-assert.commandWorked(db.adminCommand({ shardcollection: dbname + "." + coll,
-                                       key: { a: "hashed" },
-                                       numInitialChunks: 500 }));
+//for simplicity turn off balancer
+s.stopBalancer();
 
+var res = db.adminCommand({ shardcollection : dbname + "." + coll,
+                             key : { a : "hashed" },
+                             numInitialChunks : 500 });
+assert.eq(res.ok, 1, "shardcollection didn't work");
 db.printShardingStatus();
-
 var numChunks = s.config.chunks.count();
 assert.eq(numChunks, 500 , "should be exactly 500 chunks");
 
@@ -26,16 +23,15 @@ var shards = s.config.shards.find();
 shards.forEach(
     // check that each shard has one third the numInitialChunks
     function (shard){
-        var numChunksOnShard = s.config.chunks.find({"shard": shard._id}).count();
+        var numChunksOnShard = s.config.chunks.find({"shard" : shard._id}).count();
         assert.gte(numChunksOnShard, Math.floor(500/3));
     }
 );
 
-// Check that the collection gets dropped correctly (which doesn't happen if pre-splitting fails to
-// create the collection on all shards).
-res = db.runCommand({ "drop": coll });
+// Check that the collection gets dropped correctly (which doesn't happen if pre-splitting
+// fails to create the collection on all shards).
+res = db.runCommand({ "drop" : coll });
 assert.eq(res.ok, 1, "couldn't drop empty, pre-split collection");
 
 s.stop();
 
-})();