diff options
author | Henrik Edin <henrik.edin@mongodb.com> | 2020-11-20 17:03:39 -0500 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-11-21 18:08:08 +0000 |
commit | b4de2e9b4fce34587a3c7ddb1193c43d865cfe34 (patch) | |
tree | 6d5117b5769c1d7ce3e55c68a6199968604be967 | |
parent | 40fb4677db516968c8560b2e7db9c587b887d79a (diff) | |
download | mongo-b4de2e9b4fce34587a3c7ddb1193c43d865cfe34.tar.gz |
SERVER-53012 Fix initial_sync_drop_collection.js when run with EMRC=false
-rw-r--r-- | jstests/replsets/initial_sync_drop_collection.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/jstests/replsets/initial_sync_drop_collection.js b/jstests/replsets/initial_sync_drop_collection.js index 8679491b99b..4adfad01d18 100644 --- a/jstests/replsets/initial_sync_drop_collection.js +++ b/jstests/replsets/initial_sync_drop_collection.js @@ -138,11 +138,11 @@ let expectedLogFor3and4 = // We don't support 4.2 style two-phase drops with EMRC=false - in that configuration, the // collection will instead be renamed to a <db>.system.drop.* namespace before being dropped. Since -// the cloner queries collection by UUID, it will observe the first drop phase as a rename. +// the cloner queries collection by UUID, it may observe the first drop phase as a rename. // We still want to check that initial sync succeeds in such a case. if (TwoPhaseDropCollectionTest.supportsDropPendingNamespaces(replTest)) { expectedLogFor3and4 = - '{code: 21075, attr: { cloner: "CollectionCloner", stage: "query","error": (x)=>(x.code===175 && x.codeName==="QueryPlanKilled" && x.errmsg=="collection renamed from \'" + nss + "\' to \'" + rnss + "\'. UUID " + uuid)}}'; + '{code: 21075, attr: { cloner: "CollectionCloner", stage: "query","error": (x)=>(x.code===175 && x.codeName==="QueryPlanKilled" && (x.errmsg=="collection renamed from \'" + nss + "\' to \'" + rnss + "\'. UUID " + uuid || x.errmsg=="collection dropped. UUID " + uuid))}}'; } jsTestLog("[3] Testing drop-pending between getMore calls."); |