test: avoid unable to acquire lock errors on primary stepdown

NODE-2659

Author: emadum

test/functional/connections_stepdown.test.js

@@ -91,9 +91,17 @@ describe('Connections survive primary step down', function() {
             .then(() => {
               return connectionCount(checkClient).then(initialConnectionCount => {
                 return db
-                  .executeDbAdminCommand(
-                    { replSetStepDown: 5, force: true },
-                    { readPreference: 'primary' }
+                  .executeDbAdminCommand({ replSetFreeze: 0 }, { readPreference: 'secondary' })
+                  .then(result =>
+                    expect(result)
+                      .property('info')
+                      .to.equal('unfreezing')
+                  )
+                  .then(() =>
+                    db.executeDbAdminCommand(
+                      { replSetStepDown: 30, force: true },
+                      { readPreference: 'primary' }
+                    )
                   )
                   .then(() => cursor.next())
                   .then(item => expect(item.a).to.equal(3))

test/functional/spec-runner/context.js

@@ -169,8 +169,8 @@ class TestRunnerContext {
     expect(matchingEvents).to.have.lengthOf.at.least(count);
   }
 
-  runAdminCommand(command) {
-    return this.sharedClient.db('admin').command(command);
+  runAdminCommand(command, options) {
+    return this.sharedClient.db('admin').command(command, options);
   }
 
   // simulated thread helpers

test/spec/server-discovery-and-monitoring/integration/rediscover-quickly-after-step-down.json

@@ -45,14 +45,27 @@
           "name": "recordPrimary",
           "object": "testRunner"
         },
+        {
+          "name": "runAdminCommand",
+          "object": "testRunner",
+          "command_name": "replSetFreeze",
+          "arguments": {
+            "command": {
+              "replSetFreeze": 0
+            },
+            "readPreference": {
+              "mode": "Secondary"
+            }
+          }
+        },
         {
           "name": "runAdminCommand",
           "object": "testRunner",
           "command_name": "replSetStepDown",
           "arguments": {
             "command": {
-              "replSetStepDown": 1,
-              "secondaryCatchUpPeriodSecs": 1,
+              "replSetStepDown": 30,
+              "secondaryCatchUpPeriodSecs": 30,
               "force": false
             }
           }
@@ -61,7 +74,7 @@
           "name": "waitForPrimaryChange",
           "object": "testRunner",
           "arguments": {
-            "timeoutMS": 5000
+            "timeoutMS": 15000
           }
         },
         {

test/spec/server-discovery-and-monitoring/integration/rediscover-quickly-after-step-down.yml

@@ -31,19 +31,30 @@ tests:
             - _id: 4
       - name: recordPrimary
         object: testRunner
+      # Unfreeze a secondary with replSetFreeze:0 to ensure a speedy election.
+      - name: runAdminCommand
+        object: testRunner
+        command_name: replSetFreeze
+        arguments:
+          command:
+            replSetFreeze: 0
+          readPreference:
+            mode: Secondary
       # Run replSetStepDown on the meta client.
       - name: runAdminCommand
         object: testRunner
         command_name: replSetStepDown
         arguments:
           command:
-            replSetStepDown: 1
-            secondaryCatchUpPeriodSecs: 1
+            replSetStepDown: 30
+            secondaryCatchUpPeriodSecs: 30
             force: false
       - name: waitForPrimaryChange
         object: testRunner
         arguments:
-          timeoutMS: 5000
+          # We use a relatively large timeout here to workaround slow
+          # elections on Windows, possibly caused by SERVER-48154.
+          timeoutMS: 15000
       # Rediscover the new primary.
       - name: insertMany
         object: collection