1 files changed, 67 insertions, 68 deletions
diff --git a/jstests/noPassthrough/killop.js b/jstests/noPassthrough/killop.js
index 69305f25747..53f14b1f838 100644
--- a/jstests/noPassthrough/killop.js
+++ b/jstests/noPassthrough/killop.js
@@ -2,72 +2,71 @@
 // @tags: [requires_replication, requires_sharding]
 
 (function() {
-    "use strict";
-
-    const dbName = "killop";
-    const collName = "test";
-
-    // 'conn' is a connection to either a mongod when testing a replicaset or a mongos when testing
-    // a sharded cluster. 'shardConn' is a connection to the mongod we enable failpoints on.
-    function runTest(conn, shardConn) {
-        const db = conn.getDB(dbName);
-        assert.commandWorked(db.dropDatabase());
-        assert.writeOK(db.getCollection(collName).insert({x: 1}));
-
-        assert.commandWorked(
-            shardConn.adminCommand({setParameter: 1, internalQueryExecYieldIterations: 1}));
-        assert.commandWorked(shardConn.adminCommand(
-            {"configureFailPoint": "setYieldAllLocksHang", "mode": "alwaysOn"}));
-
-        const queryToKill = "assert.commandWorked(db.getSiblingDB('" + dbName +
-            "').runCommand({find: '" + collName + "', filter: {x: 1}}));";
-        const awaitShell = startParallelShell(queryToKill, conn.port);
-        let opId;
-
-        assert.soon(
-            function() {
-                const result =
-                    db.currentOp({"ns": dbName + "." + collName, "command.filter": {x: 1}});
-                assert.commandWorked(result);
-                if (result.inprog.length === 1 && result.inprog[0].numYields > 0) {
-                    opId = result.inprog[0].opid;
-                    return true;
-                }
-
-                return false;
-            },
-            function() {
-                return "Failed to find operation in currentOp() output: " +
-                    tojson(db.currentOp({"ns": dbName + "." + collName}));
-            });
-
-        assert.commandWorked(db.killOp(opId));
-
-        let result = db.currentOp({"ns": dbName + "." + collName, "command.filter": {x: 1}});
-        assert.commandWorked(result);
-        assert(result.inprog.length === 1, tojson(db.currentOp()));
-        assert(result.inprog[0].hasOwnProperty("killPending"));
-        assert.eq(true, result.inprog[0].killPending);
-
-        assert.commandWorked(
-            shardConn.adminCommand({"configureFailPoint": "setYieldAllLocksHang", "mode": "off"}));
-
-        const exitCode = awaitShell({checkExitSuccess: false});
-        assert.neq(0, exitCode, "Expected shell to exit with failure due to operation kill");
-
-        result = db.currentOp({"ns": dbName + "." + collName, "query.filter": {x: 1}});
-        assert.commandWorked(result);
-        assert(result.inprog.length === 0, tojson(db.currentOp()));
-    }
-
-    const st = new ShardingTest({shards: 1, rs: {nodes: 1}, mongos: 1});
-    const shardConn = st.rs0.getPrimary();
-
-    // Test killOp against mongod.
-    runTest(shardConn, shardConn);
-
-    // Test killOp against mongos.
-    runTest(st.s, shardConn);
-
-    st.stop();
+"use strict";
+
+const dbName = "killop";
+const collName = "test";
+
+// 'conn' is a connection to either a mongod when testing a replicaset or a mongos when testing
+// a sharded cluster. 'shardConn' is a connection to the mongod we enable failpoints on.
+function runTest(conn, shardConn) {
+    const db = conn.getDB(dbName);
+    assert.commandWorked(db.dropDatabase());
+    assert.writeOK(db.getCollection(collName).insert({x: 1}));
+
+    assert.commandWorked(
+        shardConn.adminCommand({setParameter: 1, internalQueryExecYieldIterations: 1}));
+    assert.commandWorked(
+        shardConn.adminCommand({"configureFailPoint": "setYieldAllLocksHang", "mode": "alwaysOn"}));
+
+    const queryToKill = "assert.commandWorked(db.getSiblingDB('" + dbName +
+        "').runCommand({find: '" + collName + "', filter: {x: 1}}));";
+    const awaitShell = startParallelShell(queryToKill, conn.port);
+    let opId;
+
+    assert.soon(
+        function() {
+            const result = db.currentOp({"ns": dbName + "." + collName, "command.filter": {x: 1}});
+            assert.commandWorked(result);
+            if (result.inprog.length === 1 && result.inprog[0].numYields > 0) {
+                opId = result.inprog[0].opid;
+                return true;
+            }
+
+            return false;
+        },
+        function() {
+            return "Failed to find operation in currentOp() output: " +
+                tojson(db.currentOp({"ns": dbName + "." + collName}));
+        });
+
+    assert.commandWorked(db.killOp(opId));
+
+    let result = db.currentOp({"ns": dbName + "." + collName, "command.filter": {x: 1}});
+    assert.commandWorked(result);
+    assert(result.inprog.length === 1, tojson(db.currentOp()));
+    assert(result.inprog[0].hasOwnProperty("killPending"));
+    assert.eq(true, result.inprog[0].killPending);
+
+    assert.commandWorked(
+        shardConn.adminCommand({"configureFailPoint": "setYieldAllLocksHang", "mode": "off"}));
+
+    const exitCode = awaitShell({checkExitSuccess: false});
+    assert.neq(0, exitCode, "Expected shell to exit with failure due to operation kill");
+
+    result = db.currentOp({"ns": dbName + "." + collName, "query.filter": {x: 1}});
+    assert.commandWorked(result);
+    assert(result.inprog.length === 0, tojson(db.currentOp()));
+}
+
+const st = new ShardingTest({shards: 1, rs: {nodes: 1}, mongos: 1});
+const shardConn = st.rs0.getPrimary();
+
+// Test killOp against mongod.
+runTest(shardConn, shardConn);
+
+// Test killOp against mongos.
+runTest(st.s, shardConn);
+
+st.stop();
 })();