1 files changed, 125 insertions, 121 deletions
diff --git a/jstests/sharding/verify_sessions_expiration_sharded.js b/jstests/sharding/verify_sessions_expiration_sharded.js
index fe743f147d6..96cd020aadd 100644
--- a/jstests/sharding/verify_sessions_expiration_sharded.js
+++ b/jstests/sharding/verify_sessions_expiration_sharded.js
@@ -16,135 +16,139 @@
 //    @tags: [requires_find_command]
 
 (function() {
-    "use strict";
-
-    // This test makes assertions about the number of logical session records.
-    TestData.disableImplicitSessions = true;
-
-    load("jstests/libs/pin_getmore_cursor.js");  // For "withPinnedCursor".
-
-    const refresh = {refreshLogicalSessionCacheNow: 1};
-    const startSession = {startSession: 1};
-    const failPointName = "waitAfterPinningCursorBeforeGetMoreBatch";
-
-    function refreshSessionsAndVerifyCount(mongosConfig, shardConfig, expectedCount) {
-        mongosConfig.runCommand(refresh);
-        shardConfig.runCommand(refresh);
-
-        assert.eq(mongosConfig.system.sessions.count(), expectedCount);
-    }
-
-    function verifyOpenCursorCount(db, expectedCount) {
-        assert.eq(db.serverStatus().metrics.cursor.open.total, expectedCount);
-    }
-
-    function getSessions(config) {
-        return config.system.sessions.aggregate([{'$listSessions': {allUsers: true}}]).toArray();
-    }
-
-    const dbName = "test";
-    const testCollName = "verify_sessions_find_get_more";
-
-    let shardingTest = new ShardingTest({
-        shards: 1,
-    });
-
-    let mongos = shardingTest.s;
-    let db = mongos.getDB(dbName);
-    let mongosConfig = mongos.getDB("config");
-    let shardConfig = shardingTest.rs0.getPrimary().getDB("config");
-
-    // 1. Verify that sessions expire from config.system.sessions after the timeout has passed.
-    for (let i = 0; i < 5; i++) {
-        let res = db.runCommand(startSession);
-        assert.commandWorked(res, "unable to start session");
-    }
-    refreshSessionsAndVerifyCount(mongosConfig, shardConfig, 5);
-
-    // Manually delete entries in config.system.sessions to simulate TTL expiration.
-    assert.commandWorked(mongosConfig.system.sessions.remove({}));
-    refreshSessionsAndVerifyCount(mongosConfig, shardConfig, 0);
-
-    // 2. Verify that getMores after finds will update the 'lastUse' field on documents in the
-    // config.system.sessions collection.
-    for (let i = 0; i < 10; i++) {
-        db[testCollName].insert({_id: i, a: i, b: 1});
-    }
-
-    let cursors = [];
-    for (let i = 0; i < 5; i++) {
-        let session = mongos.startSession({});
-        assert.commandWorked(session.getDatabase("admin").runCommand({usersInfo: 1}),
-                             "initialize the session");
-        cursors.push(session.getDatabase(dbName)[testCollName].find({b: 1}).batchSize(1));
-        assert(cursors[i].hasNext());
+"use strict";
+
+// This test makes assertions about the number of logical session records.
+TestData.disableImplicitSessions = true;
+
+load("jstests/libs/pin_getmore_cursor.js");  // For "withPinnedCursor".
+
+const refresh = {
+    refreshLogicalSessionCacheNow: 1
+};
+const startSession = {
+    startSession: 1
+};
+const failPointName = "waitAfterPinningCursorBeforeGetMoreBatch";
+
+function refreshSessionsAndVerifyCount(mongosConfig, shardConfig, expectedCount) {
+    mongosConfig.runCommand(refresh);
+    shardConfig.runCommand(refresh);
+
+    assert.eq(mongosConfig.system.sessions.count(), expectedCount);
+}
+
+function verifyOpenCursorCount(db, expectedCount) {
+    assert.eq(db.serverStatus().metrics.cursor.open.total, expectedCount);
+}
+
+function getSessions(config) {
+    return config.system.sessions.aggregate([{'$listSessions': {allUsers: true}}]).toArray();
+}
+
+const dbName = "test";
+const testCollName = "verify_sessions_find_get_more";
+
+let shardingTest = new ShardingTest({
+    shards: 1,
+});
+
+let mongos = shardingTest.s;
+let db = mongos.getDB(dbName);
+let mongosConfig = mongos.getDB("config");
+let shardConfig = shardingTest.rs0.getPrimary().getDB("config");
+
+// 1. Verify that sessions expire from config.system.sessions after the timeout has passed.
+for (let i = 0; i < 5; i++) {
+    let res = db.runCommand(startSession);
+    assert.commandWorked(res, "unable to start session");
+}
+refreshSessionsAndVerifyCount(mongosConfig, shardConfig, 5);
+
+// Manually delete entries in config.system.sessions to simulate TTL expiration.
+assert.commandWorked(mongosConfig.system.sessions.remove({}));
+refreshSessionsAndVerifyCount(mongosConfig, shardConfig, 0);
+
+// 2. Verify that getMores after finds will update the 'lastUse' field on documents in the
+// config.system.sessions collection.
+for (let i = 0; i < 10; i++) {
+    db[testCollName].insert({_id: i, a: i, b: 1});
+}
+
+let cursors = [];
+for (let i = 0; i < 5; i++) {
+    let session = mongos.startSession({});
+    assert.commandWorked(session.getDatabase("admin").runCommand({usersInfo: 1}),
+                         "initialize the session");
+    cursors.push(session.getDatabase(dbName)[testCollName].find({b: 1}).batchSize(1));
+    assert(cursors[i].hasNext());
+}
+
+refreshSessionsAndVerifyCount(mongosConfig, shardConfig, 5);
+verifyOpenCursorCount(mongosConfig, 5);
+
+let sessionsCollectionArray;
+let lastUseValues = [];
+for (let i = 0; i < 3; i++) {
+    for (let j = 0; j < cursors.length; j++) {
+        cursors[j].next();
     }
 
     refreshSessionsAndVerifyCount(mongosConfig, shardConfig, 5);
     verifyOpenCursorCount(mongosConfig, 5);
 
-    let sessionsCollectionArray;
-    let lastUseValues = [];
-    for (let i = 0; i < 3; i++) {
-        for (let j = 0; j < cursors.length; j++) {
-            cursors[j].next();
-        }
-
-        refreshSessionsAndVerifyCount(mongosConfig, shardConfig, 5);
-        verifyOpenCursorCount(mongosConfig, 5);
-
-        sessionsCollectionArray = getSessions(mongosConfig);
+    sessionsCollectionArray = getSessions(mongosConfig);
 
-        if (i == 0) {
-            for (let j = 0; j < sessionsCollectionArray.length; j++) {
-                lastUseValues.push(sessionsCollectionArray[j].lastUse);
-            }
-        } else {
-            for (let j = 0; j < sessionsCollectionArray.length; j++) {
-                assert.gt(sessionsCollectionArray[j].lastUse, lastUseValues[j]);
-                lastUseValues[j] = sessionsCollectionArray[j].lastUse;
-            }
+    if (i == 0) {
+        for (let j = 0; j < sessionsCollectionArray.length; j++) {
+            lastUseValues.push(sessionsCollectionArray[j].lastUse);
+        }
+    } else {
+        for (let j = 0; j < sessionsCollectionArray.length; j++) {
+            assert.gt(sessionsCollectionArray[j].lastUse, lastUseValues[j]);
+            lastUseValues[j] = sessionsCollectionArray[j].lastUse;
         }
     }
-
-    // 3. Verify that letting sessions expire (simulated by manual deletion) will kill their
-    // cursors.
-    assert.commandWorked(mongosConfig.system.sessions.remove({}));
-
-    refreshSessionsAndVerifyCount(mongosConfig, shardConfig, 0);
-    verifyOpenCursorCount(mongosConfig, 0);
-
-    for (let i = 0; i < cursors.length; i++) {
-        assert.commandFailedWithCode(
-            db.runCommand({getMore: cursors[i]._cursor._cursorid, collection: testCollName}),
-            ErrorCodes.CursorNotFound,
-            'expected getMore to fail because the cursor was killed');
-    }
-
-    // 4. Verify that an expired session (simulated by manual deletion) that has a currently
-    // running operation will be vivified during the logical session cache refresh.
-    let pinnedCursorSession = mongos.startSession();
-    let pinnedCursorDB = pinnedCursorSession.getDatabase(dbName);
-
-    withPinnedCursor({
-        conn: mongos,
-        sessionId: pinnedCursorSession,
-        db: pinnedCursorDB,
-        assertFunction: (cursorId, coll) => {
-            assert.commandWorked(mongosConfig.system.sessions.remove({}));
-            verifyOpenCursorCount(mongosConfig, 1);
-
-            refreshSessionsAndVerifyCount(mongosConfig, shardConfig, 1);
-
-            let db = coll.getDB();
-            assert.commandWorked(db.runCommand({killCursors: coll.getName(), cursors: [cursorId]}));
-        },
-        runGetMoreFunc: () => {
-            db.runCommand({getMore: cursorId, collection: collName, lsid: sessionId});
-        },
-        failPointName: failPointName
+}
+
+// 3. Verify that letting sessions expire (simulated by manual deletion) will kill their
+// cursors.
+assert.commandWorked(mongosConfig.system.sessions.remove({}));
+
+refreshSessionsAndVerifyCount(mongosConfig, shardConfig, 0);
+verifyOpenCursorCount(mongosConfig, 0);
+
+for (let i = 0; i < cursors.length; i++) {
+    assert.commandFailedWithCode(
+        db.runCommand({getMore: cursors[i]._cursor._cursorid, collection: testCollName}),
+        ErrorCodes.CursorNotFound,
+        'expected getMore to fail because the cursor was killed');
+}
+
+// 4. Verify that an expired session (simulated by manual deletion) that has a currently
+// running operation will be vivified during the logical session cache refresh.
+let pinnedCursorSession = mongos.startSession();
+let pinnedCursorDB = pinnedCursorSession.getDatabase(dbName);
+
+withPinnedCursor({
+    conn: mongos,
+    sessionId: pinnedCursorSession,
+    db: pinnedCursorDB,
+    assertFunction: (cursorId, coll) => {
+        assert.commandWorked(mongosConfig.system.sessions.remove({}));
+        verifyOpenCursorCount(mongosConfig, 1);
+
+        refreshSessionsAndVerifyCount(mongosConfig, shardConfig, 1);
+
+        let db = coll.getDB();
+        assert.commandWorked(db.runCommand({killCursors: coll.getName(), cursors: [cursorId]}));
+    },
+    runGetMoreFunc: () => {
+        db.runCommand({getMore: cursorId, collection: collName, lsid: sessionId});
     },
-                     /* assertEndCounts */ false);
+    failPointName: failPointName
+},
+                 /* assertEndCounts */ false);
 
-    shardingTest.stop();
+shardingTest.stop();
 })();