summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXuerui Fa <xuerui.fa@mongodb.com>2020-06-03 12:16:08 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-06-18 00:15:51 +0000
commitd57b69a04cadb876d982366274dcad124d60e211 (patch)
tree0c01b1ccaa1ab4ac5a653e4569c43faafc3d97f9
parentc575ff0c457eed75fb8c472980aac6b7ceeb304f (diff)
downloadmongo-d57b69a04cadb876d982366274dcad124d60e211.tar.gz
SERVER-48569: Add ConflictingOperationInProgress as acceptable error code to stepDown in validateCollectionsCallback
(cherry picked from commit 6122ee1243ec051d4e1d39efe70235b897f956c5)
-rw-r--r--jstests/libs/override_methods/validate_collections_on_shutdown.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/jstests/libs/override_methods/validate_collections_on_shutdown.js b/jstests/libs/override_methods/validate_collections_on_shutdown.js
index a2dafb1560d..939aa809c0d 100644
--- a/jstests/libs/override_methods/validate_collections_on_shutdown.js
+++ b/jstests/libs/override_methods/validate_collections_on_shutdown.js
@@ -69,7 +69,8 @@ MongoRunner.validateCollectionsCallback = function(port) {
[
ErrorCodes.NotMaster,
ErrorCodes.NotYetInitialized,
- ErrorCodes.Unauthorized
+ ErrorCodes.Unauthorized,
+ ErrorCodes.ConflictingOperationInProgress
]);
const res = conn.adminCommand({replSetFreeze: kFreezeTimeSecs});
assert.commandWorkedOrFailedWithCode(res, [