diff options
| author | Xiangyu Yao <xiangyu.yao@mongodb.com> | 2018-12-05 17:10:21 -0500 |
|---|---|---|
| committer | Xiangyu Yao <xiangyu.yao@mongodb.com> | 2018-12-12 13:06:02 -0500 |
| commit | 4a47c79bcba9fe926b2525a92abd34dbc583e2c7 (patch) | |
| tree | 285dc30a0e3b6f3b7435fce2270687f5615c7b31 /jstests/replsets/rollback_drop_database.js | |
| parent | 76c82f567ff8783bd37fa1a34d62cecf0a367599 (diff) | |
| download | mongo-4a47c79bcba9fe926b2525a92abd34dbc583e2c7.tar.gz | |
SERVER-35290 dropDatabase command should respect maxTimeMS
Diffstat (limited to 'jstests/replsets/rollback_drop_database.js')
| -rw-r--r-- | jstests/replsets/rollback_drop_database.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/jstests/replsets/rollback_drop_database.js b/jstests/replsets/rollback_drop_database.js index b48774efdd3..27a7fb75cb3 100644 --- a/jstests/replsets/rollback_drop_database.js +++ b/jstests/replsets/rollback_drop_database.js @@ -27,7 +27,7 @@ // Set a failpoint on the original primary, so that it blocks after it commits the last // 'dropCollection' entry but before the 'dropDatabase' entry is logged. assert.commandWorked(rollbackNode.adminCommand( - {configureFailPoint: "dropDatabaseHangAfterLastCollectionDrop", mode: "alwaysOn"})); + {configureFailPoint: "dropDatabaseHangBeforeLog", mode: "alwaysOn"})); // Issue a 'dropDatabase' command. let dropDatabaseFn = function() { @@ -40,8 +40,7 @@ let waitForDropDatabaseToFinish = startParallelShell(dropDatabaseFn, rollbackNode.port); // Ensure that we've hit the failpoint before moving on. - checkLog.contains(rollbackNode, - "dropDatabase - fail point dropDatabaseHangAfterLastCollectionDrop enabled"); + checkLog.contains(rollbackNode, "dropDatabase - fail point dropDatabaseHangBeforeLog enabled"); assert.eq(false, syncSourceNode.getDB(oldDbName).getCollectionNames().includes("beforeRollback")); @@ -49,8 +48,8 @@ // Allow the final 'dropDatabase' entry to be logged on the now isolated primary. // This is the rollback node's divergent oplog entry. - assert.commandWorked(rollbackNode.adminCommand( - {configureFailPoint: "dropDatabaseHangAfterLastCollectionDrop", mode: "off"})); + assert.commandWorked( + rollbackNode.adminCommand({configureFailPoint: "dropDatabaseHangBeforeLog", mode: "off"})); waitForDropDatabaseToFinish(); assert.eq(false, rollbackNode.getDB(oldDbName).getCollectionNames().includes("beforeRollback")); jsTestLog("Database " + oldDbName + " successfully dropped on primary node " + |