SERVER-12605 update ShardingTest to turn off balancer by default

Signed-off-by: Benety Goh <benety@mongodb.com>

8 files changed, 18 insertions, 10 deletions

diff --git a/jstests/sharding/auth.js b/jstests/sharding/auth.js
index 2527ccf14c7..122f768427a 100644
--- a/jstests/sharding/auth.js
+++ b/jstests/sharding/auth.js
@@ -40,7 +40,13 @@ function getShardName(rsTest) {
     return config._id+"/"+members.join(",");
 }
 
-var s = new ShardingTest( "auth1", 0 , 0 , 1 , {rs: true, extraOptions : {"keyFile" : "jstests/libs/key1"}, noChunkSize : true});
+var s = new ShardingTest( "auth1", 0 , 0 , 1 ,
+  {
+    rs: true,
+    extraOptions : {"keyFile" : "jstests/libs/key1"},
+    noChunkSize : true,
+    enableBalancer:true
+  } );
 
 print("logging in first, if there was an unclean shutdown the user might already exist");
 login(adminUser);
diff --git a/jstests/sharding/auto1.js b/jstests/sharding/auto1.js
index 5211108ece8..23566935ef6 100644
--- a/jstests/sharding/auto1.js
+++ b/jstests/sharding/auto1.js
@@ -1,6 +1,6 @@
 // auto1.js
 
-s = new ShardingTest( "auto1" , 2 , 1 , 1 );
+s = new ShardingTest( "auto1" , 2 , 1 , 1, { enableBalancer : 1 } );
 
 s.adminCommand( { enablesharding : "test" } );
 s.adminCommand( { shardcollection : "test.foo" , key : { num : 1 } } );
diff --git a/jstests/sharding/mapReduce.js b/jstests/sharding/mapReduce.js
index 60b0d6c0a68..9d5e5d0c54c 100644
--- a/jstests/sharding/mapReduce.js
+++ b/jstests/sharding/mapReduce.js
@@ -8,7 +8,7 @@ verifyOutput = function(out) {
 }
 
 
-s = new ShardingTest( "mrShard" , 2 , 1 , 1 , { chunksize : 1 } );
+s = new ShardingTest( "mrShard" , 2 , 1 , 1 , { chunksize : 1, enableBalancer : 1 } );
 
 s.adminCommand( { enablesharding : "mrShard" } )
 s.adminCommand( { shardcollection : "mrShard.srcSharded", key : { "_id" : 1 } } )
diff --git a/jstests/sharding/remove2.js b/jstests/sharding/remove2.js
index f6fc93c4faf..fe0819b90a8 100644
--- a/jstests/sharding/remove2.js
+++ b/jstests/sharding/remove2.js
@@ -78,7 +78,8 @@ var st = new ShardingTest( testName = "remove2",
                            { chunkSize : 1,
                              rs : true,
                              rs0 : { nodes : 2 },
-                             rs1 : { nodes : 2 }
+                             rs1 : { nodes : 2 },
+                             enableBalancer: true
                            });
 
 // Pending resolution of SERVER-8598, we need to wait for deletion after chunk migrations to avoid
diff --git a/jstests/sharding/shard3.js b/jstests/sharding/shard3.js
index 0d51d2497f1..8674df81aca 100644
--- a/jstests/sharding/shard3.js
+++ b/jstests/sharding/shard3.js
@@ -1,6 +1,6 @@
 // shard3.js
 
-s = new ShardingTest( "shard3" , 2 , 1 , 2 );
+s = new ShardingTest( "shard3" , 2 , 1 , 2 , { enableBalancer : 1 } );
 
 s2 = s._mongos[1];
 
diff --git a/jstests/sharding/stats.js b/jstests/sharding/stats.js
index 8660c782a41..3046c06bca7 100644
--- a/jstests/sharding/stats.js
+++ b/jstests/sharding/stats.js
@@ -1,4 +1,4 @@
-s = new ShardingTest( "stats" , 2 , 1 , 1 );
+s = new ShardingTest( "stats" , 2 , 1 , 1, { enableBalancer : 1 } );
 s.adminCommand( { enablesharding : "test" } );
 
 a = s._connections[0].getDB( "test" );
diff --git a/jstests/sharding/tag_auto_split.js b/jstests/sharding/tag_auto_split.js
index 6f29c589601..80dae792b10 100644
--- a/jstests/sharding/tag_auto_split.js
+++ b/jstests/sharding/tag_auto_split.js
@@ -1,6 +1,6 @@
 // test to make sure that tag ranges get split
 
-s = new ShardingTest( "tag_auto_split", 2, 0, 1, { nopreallocj : true } );
+s = new ShardingTest( "tag_auto_split", 2, 0, 1, { nopreallocj : true, enableBalancer : true } );
 
 db = s.getDB( "test" );
 
@@ -24,7 +24,7 @@ printjson( sh.status() );
 s.stop();
 
 //test without full shard key on tags
-s = new ShardingTest( "tag_auto_split2", 2, 0, 1, { nopreallocj : true } );
+s = new ShardingTest( "tag_auto_split2", 2, 0, 1, { nopreallocj : true, enableBalancer : true } );
 
 db = s.getDB( "test" );
 
diff --git a/jstests/sharding/zbigMapReduce.js b/jstests/sharding/zbigMapReduce.js
index 07219374a66..52c85344044 100644
--- a/jstests/sharding/zbigMapReduce.js
+++ b/jstests/sharding/zbigMapReduce.js
@@ -4,8 +4,9 @@ s = new ShardingTest( { shards : 2,
                         other: { rs: true, 
                                  numReplicas: 2, 
                                  chunksize : 1,
-                                 rsOptions: { oplogSize : 50 } } } 
-                       );
+                                 rsOptions: { oplogSize : 50 },
+                                 enableBalancer : 1
+                             } } );
 
 // reduce chunk size to split
 var config = s.getDB("config");