1 files changed, 65 insertions, 69 deletions
diff --git a/jstests/sharding/count_slaveok.js b/jstests/sharding/count_slaveok.js
index eaf39a18352..70f0d7091d9 100644
--- a/jstests/sharding/count_slaveok.js
+++ b/jstests/sharding/count_slaveok.js
@@ -1,74 +1,70 @@
 // Tests count and distinct using slaveOk. Also tests a scenario querying a set where only one
 // secondary is up.
 (function() {
-'use strict';
-
-var st = new ShardingTest({ name: "countSlaveOk",
-                            shards: 1,
-                            mongos: 1,
-                            other: { rs: true,
-                                     rs0: { nodes: 2 } } });
-
-var rst = st._rs[0].test;
-
-// Insert data into replica set
-var conn = new Mongo(st.s.host);
-conn.setLogLevel(3);
-
-var coll = conn.getCollection('test.countSlaveOk');
-coll.drop();
-
-var bulk = coll.initializeUnorderedBulkOp();
-for( var i = 0; i < 300; i++ ){
-    bulk.insert({ i: i % 10 });
-}
-assert.writeOK(bulk.execute());
-
-var connA = conn;
-var connB = new Mongo( st.s.host );
-var connC = new Mongo( st.s.host );
-
-st.printShardingStatus();
-
-// Wait for client to update itself and replication to finish
-rst.awaitReplication();
-
-var primary = rst.getPrimary();
-var sec = rst.getSecondary();
-
-// Data now inserted... stop the master, since only two in set, other will still be secondary
-rst.stop(rst.getPrimary());
-printjson( rst.status() );
-
-// Wait for the mongos to recognize the slave
-ReplSetTest.awaitRSClientHosts( conn, sec, { ok : true, secondary : true } );
-
-// Make sure that mongos realizes that primary is already down
-ReplSetTest.awaitRSClientHosts( conn, primary, { ok : false });
-
-// Need to check slaveOk=true first, since slaveOk=false will destroy conn in pool when
-// master is down
-conn.setSlaveOk();
-
-// count using the command path
-assert.eq( 30, coll.find({ i : 0 }).count() );
-// count using the query path
-assert.eq( 30, coll.find({ i : 0 }).itcount() );
-assert.eq( 10, coll.distinct("i").length );
-
-try {
-    conn.setSlaveOk( false );
-    // Should throw exception, since not slaveOk'd
-    coll.find({ i : 0 }).count();
-    
-    print( "Should not reach here!" );
-    assert( false );
-    
-}
-catch( e ){
-    print( "Non-slaveOk'd connection failed." );
-}
-
-st.stop();
+    'use strict';
+
+    var st = new ShardingTest(
+        {name: "countSlaveOk", shards: 1, mongos: 1, other: {rs: true, rs0: {nodes: 2}}});
+
+    var rst = st._rs[0].test;
+
+    // Insert data into replica set
+    var conn = new Mongo(st.s.host);
+    conn.setLogLevel(3);
+
+    var coll = conn.getCollection('test.countSlaveOk');
+    coll.drop();
+
+    var bulk = coll.initializeUnorderedBulkOp();
+    for (var i = 0; i < 300; i++) {
+        bulk.insert({i: i % 10});
+    }
+    assert.writeOK(bulk.execute());
+
+    var connA = conn;
+    var connB = new Mongo(st.s.host);
+    var connC = new Mongo(st.s.host);
+
+    st.printShardingStatus();
+
+    // Wait for client to update itself and replication to finish
+    rst.awaitReplication();
+
+    var primary = rst.getPrimary();
+    var sec = rst.getSecondary();
+
+    // Data now inserted... stop the master, since only two in set, other will still be secondary
+    rst.stop(rst.getPrimary());
+    printjson(rst.status());
+
+    // Wait for the mongos to recognize the slave
+    ReplSetTest.awaitRSClientHosts(conn, sec, {ok: true, secondary: true});
+
+    // Make sure that mongos realizes that primary is already down
+    ReplSetTest.awaitRSClientHosts(conn, primary, {ok: false});
+
+    // Need to check slaveOk=true first, since slaveOk=false will destroy conn in pool when
+    // master is down
+    conn.setSlaveOk();
+
+    // count using the command path
+    assert.eq(30, coll.find({i: 0}).count());
+    // count using the query path
+    assert.eq(30, coll.find({i: 0}).itcount());
+    assert.eq(10, coll.distinct("i").length);
+
+    try {
+        conn.setSlaveOk(false);
+        // Should throw exception, since not slaveOk'd
+        coll.find({i: 0}).count();
+
+        print("Should not reach here!");
+        assert(false);
+
+    } catch (e) {
+        print("Non-slaveOk'd connection failed.");
+    }
+
+    st.stop();
 
 })();