SERVER-22672 shard3.js should not stop the balancer through sh

Also removes the jumbo1.js test from the stepdown suite because it never
completes due to the balancer starting and stopping too frequently.

1 files changed, 6 insertions, 7 deletions

diff --git a/jstests/sharding/shard3.js b/jstests/sharding/shard3.js
index 64716ede81e..a380e0b10c2 100644
--- a/jstests/sharding/shard3.js
+++ b/jstests/sharding/shard3.js
@@ -10,20 +10,19 @@
     s.adminCommand({enablesharding: "test"});
     s.ensurePrimaryShard('test', 'shard0001');
     s.adminCommand({shardcollection: "test.foo", key: {num: 1}});
-    if (s.configRS) {
-        // Ensure that the second mongos will see the movePrimary
-        s.configRS.awaitLastOpCommitted();
-    }
+
+    // Ensure that the second mongos will see the movePrimary
+    s.configRS.awaitLastOpCommitted();
 
     assert(sh.getBalancerState(), "A1");
 
-    sh.stopBalancer();
+    s.stopBalancer();
     assert(!sh.getBalancerState(), "A2");
 
-    sh.startBalancer();
+    s.startBalancer();
     assert(sh.getBalancerState(), "A3");
 
-    sh.stopBalancer();
+    s.stopBalancer();
     assert(!sh.getBalancerState(), "A4");
 
     s.config.databases.find().forEach(printjson);