From d57b69a04cadb876d982366274dcad124d60e211 Mon Sep 17 00:00:00 2001
From: Xuerui Fa <xuerui.fa@mongodb.com>
Date: Wed, 3 Jun 2020 12:16:08 -0400
Subject: SERVER-48569: Add ConflictingOperationInProgress as acceptable error
 code to stepDown in validateCollectionsCallback

(cherry picked from commit 6122ee1243ec051d4e1d39efe70235b897f956c5)
---
 jstests/libs/override_methods/validate_collections_on_shutdown.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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, [
-- 
cgit v1.2.1