SERVER-8786 Backport stability fixes to sharding/authConnectionHook.js

1 files changed, 4 insertions, 5 deletions

diff --git a/jstests/sharding/authConnectionHook.js b/jstests/sharding/authConnectionHook.js
index 03b65fee848..103021f4a06 100644
--- a/jstests/sharding/authConnectionHook.js
+++ b/jstests/sharding/authConnectionHook.js
@@ -13,6 +13,7 @@ adminDB.auth('admin', 'password');
 
 adminDB.runCommand({enableSharding : "test"});
 adminDB.runCommand({shardCollection : "test.foo", key : {x : 1}});
+st.stopBalancer();
 
 for (var i = 0; i < 100; i++) {
     db.foo.insert({x:i});
@@ -22,14 +23,12 @@ adminDB.runCommand({split: "test.foo", middle: {x:50}});
 var curShard = st.getShard("test.foo", {x:75});
 var otherShard = st.getOther(curShard).name;
 adminDB.runCommand({moveChunk: "test.foo", find: {x:25}, to: otherShard});
+assert.soon( function() { return !st.isAnyBalanceInFlight(); });
 
 st.printShardingStatus();
 
-var savedOptions = st.shard0.savedOptions;
-printjson(savedOptions);
-savedOptions.restart = true;
-MongoRunner.stopMongod(st.shard0.port);
-MongoRunner.runMongod(savedOptions);
+MongoRunner.stopMongod(st.shard0);
+st.shard0 = MongoRunner.runMongod({restart : st.shard0});
 
 // May fail the first couple times due to socket exceptions
 assert.soon( function() {