SERVER-22512 Remove unnecessary calls to stopBalancer

1 files changed, 29 insertions, 31 deletions

diff --git a/jstests/sharding/hash_shard_unique_compound.js b/jstests/sharding/hash_shard_unique_compound.js
index 3d82c2452b5..abaf45260b9 100644
--- a/jstests/sharding/hash_shard_unique_compound.js
+++ b/jstests/sharding/hash_shard_unique_compound.js
@@ -2,44 +2,42 @@
 // Does 2 things and checks for consistent error:
 //  1.) shard collection on hashed "a", ensure unique index {a:1, b:1}
 //  2.) reverse order
+(function() {
+    'use strict';
 
-var s = new ShardingTest({name: jsTestName(), shards: 1, mongos: 1, verbose: 1});
-var dbName = "test";
-var collName = "foo";
-var ns = dbName + "." + collName;
-var db = s.getDB(dbName);
-var coll = db.getCollection(collName);
+    var s = new ShardingTest({shards: 1, mongos: 1});
+    var dbName = "test";
+    var collName = "foo";
+    var ns = dbName + "." + collName;
+    var db = s.getDB(dbName);
+    var coll = db.getCollection(collName);
 
-// Enable sharding on DB
-var res = db.adminCommand({enablesharding: dbName});
+    // Enable sharding on DB
+    assert.commandWorked(db.adminCommand({enablesharding: dbName}));
 
-// for simplicity start by turning off balancer
-var res = s.stopBalancer();
+    // Shard a fresh collection using a hashed shard key
+    assert.commandWorked(db.adminCommand({shardcollection: ns, key: {a: "hashed"}}));
 
-// shard a fresh collection using a hashed shard key
-coll.drop();
-assert.commandWorked(db.adminCommand({shardcollection: ns, key: {a: "hashed"}}));
-s.printShardingStatus();
+    // Create unique index
+    assert.commandWorked(coll.ensureIndex({a: 1, b: 1}, {unique: true}));
 
-// Create unique index
-assert.commandWorked(coll.ensureIndex({a: 1, b: 1}, {unique: true}));
+    jsTest.log("------ indexes -------");
+    jsTest.log(tojson(coll.getIndexes()));
 
-jsTest.log("------ indexes -------");
-jsTest.log(tojson(coll.getIndexes()));
+    // Second Part
+    jsTest.log("------ dropping sharded collection to start part 2 -------");
+    coll.drop();
 
-// Second Part
-jsTest.log("------ dropping sharded collection to start part 2 -------");
-coll.drop();
+    // Create unique index
+    assert.commandWorked(coll.ensureIndex({a: 1, b: 1}, {unique: true}));
 
-// Create unique index
-assert.commandWorked(coll.ensureIndex({a: 1, b: 1}, {unique: true}));
+    // shard a fresh collection using a hashed shard key
+    assert.commandWorked(db.adminCommand({shardcollection: ns, key: {a: "hashed"}}),
+                         "shardcollection didn't worked 2");
 
-// shard a fresh collection using a hashed shard key
-assert.commandWorked(db.adminCommand({shardcollection: ns, key: {a: "hashed"}}),
-                     "shardcollection didn't worked 2");
+    s.printShardingStatus();
+    jsTest.log("------ indexes 2-------");
+    jsTest.log(tojson(coll.getIndexes()));
 
-s.printShardingStatus();
-jsTest.log("------ indexes 2-------");
-jsTest.log(tojson(coll.getIndexes()));
-
-s.stop();
+    s.stop();
+})();