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-07-01 20:28:37 +0000
commit8cc086492a51af73e3d85499db9eb181cfea1755 (patch)
treecc62c0d0519cd48376736c302dfe2e34eb49a9ed
parentf3ae7de2c04819a1cd33205e802b19e86d227213 (diff)
downloadmongo-8cc086492a51af73e3d85499db9eb181cfea1755.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 7f05203d483..4d8b05346d3 100644
--- a/jstests/libs/override_methods/validate_collections_on_shutdown.js
+++ b/jstests/libs/override_methods/validate_collections_on_shutdown.js
@@ -68,7 +68,8 @@
[
ErrorCodes.NotMaster,
ErrorCodes.NotYetInitialized,
- ErrorCodes.Unauthorized
+ ErrorCodes.Unauthorized,
+ ErrorCodes.ConflictingOperationInProgress
]);
const res = conn.adminCommand({replSetFreeze: kFreezeTimeSecs});
assert.commandWorkedOrFailedWithCode(res, [