From 37b61a5057dee96f7d0db0b592dd084b459b7824 Mon Sep 17 00:00:00 2001 From: Gregory Wlodarek Date: Wed, 19 Feb 2020 13:55:54 -0500 Subject: SERVER-46122 Concurrency tests should expect the 'IndexBuildAborted' error code when dropping collections --- .../access_collection_in_transaction_after_catalog_changes.js | 5 +++-- jstests/concurrency/fsm_workloads/yield_with_drop.js | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jstests/concurrency/fsm_workloads/access_collection_in_transaction_after_catalog_changes.js b/jstests/concurrency/fsm_workloads/access_collection_in_transaction_after_catalog_changes.js index 6d9cddd0f06..b5823068f9c 100644 --- a/jstests/concurrency/fsm_workloads/access_collection_in_transaction_after_catalog_changes.js +++ b/jstests/concurrency/fsm_workloads/access_collection_in_transaction_after_catalog_changes.js @@ -232,8 +232,9 @@ var $config = (function() { } function createIndex(db, collName) { - assertWhenOwnColl.commandWorked( - db.getSiblingDB(this.ddlDBName)[this.ddlCollName].createIndex({x: 1})); + assertWhenOwnColl.commandWorkedOrFailedWithCode( + db.getSiblingDB(this.ddlDBName)[this.ddlCollName].createIndex({x: 1}), + [ErrorCodes.IndexBuildAborted]); } function dropColl(db, collName) { diff --git a/jstests/concurrency/fsm_workloads/yield_with_drop.js b/jstests/concurrency/fsm_workloads/yield_with_drop.js index f06f26beec8..e85e412ffc7 100644 --- a/jstests/concurrency/fsm_workloads/yield_with_drop.js +++ b/jstests/concurrency/fsm_workloads/yield_with_drop.js @@ -10,6 +10,7 @@ var $config = (function() { ErrorCodes.ConflictingOperationInProgress, ErrorCodes.CursorNotFound, ErrorCodes.DuplicateKey, + ErrorCodes.IndexBuildAborted, ErrorCodes.OperationFailed, ErrorCodes.QueryPlanKilled, ], -- cgit v1.2.1