diff options
| author | Jaume Moragues <jaume.moragues@mongodb.com> | 2020-12-15 09:54:16 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-01-20 01:08:57 +0000 |
| commit | f364f9617c5e731d3b048242a2a35e8ef7e62353 (patch) | |
| tree | 10313dc567f109c32f5851c662d02b9084cf0989 /jstests/core | |
| parent | 7bfed517d2545820e41e05f1855da254de673e28 (diff) | |
| download | mongo-f364f9617c5e731d3b048242a2a35e8ef7e62353.tar.gz | |
SERVER-52809 Implement the new drop collection path in _shardsvrDropCollection
Diffstat (limited to 'jstests/core')
| -rw-r--r-- | jstests/core/txns/kill_cursors_in_transaction.js | 10 | ||||
| -rw-r--r-- | jstests/core/txns/kill_sessions_kills_transaction.js | 10 | ||||
| -rw-r--r-- | jstests/core/views/views_all_commands.js | 1 |
3 files changed, 19 insertions, 2 deletions
diff --git a/jstests/core/txns/kill_cursors_in_transaction.js b/jstests/core/txns/kill_cursors_in_transaction.js index 3d250672a49..0394cbfca29 100644 --- a/jstests/core/txns/kill_cursors_in_transaction.js +++ b/jstests/core/txns/kill_cursors_in_transaction.js @@ -55,7 +55,15 @@ assert.soon( return adminDB .aggregate([ {$currentOp: {}}, - {$match: {"command.drop": collName, waitingForLock: true}} + { + $match: { + $or: [ + {'command.drop': collName}, + {'command._shardsvrDropCollectionParticipant': collName} + ], + waitingForLock: true + } + } ]) .itcount() === 1; }, diff --git a/jstests/core/txns/kill_sessions_kills_transaction.js b/jstests/core/txns/kill_sessions_kills_transaction.js index 226e7bff2a1..3fe592bbff9 100644 --- a/jstests/core/txns/kill_sessions_kills_transaction.js +++ b/jstests/core/txns/kill_sessions_kills_transaction.js @@ -53,7 +53,15 @@ assert.soon( return adminDB .aggregate([ {$currentOp: {}}, - {$match: {"command.drop": collName, waitingForLock: true}} + { + $match: { + $or: [ + {'command.drop': collName}, + {'command._shardsvrDropCollectionParticipant': collName} + ], + waitingForLock: true + } + } ]) .itcount() === 1; }, diff --git a/jstests/core/views/views_all_commands.js b/jstests/core/views/views_all_commands.js index bdb0861ccfb..ef2f50727cf 100644 --- a/jstests/core/views/views_all_commands.js +++ b/jstests/core/views/views_all_commands.js @@ -117,6 +117,7 @@ let viewsCommandTests = { _recvChunkStatus: {skip: isAnInternalCommand}, _shardsvrCloneCatalogData: {skip: isAnInternalCommand}, _shardsvrDropCollection: {skip: isAnInternalCommand}, + _shardsvrDropCollectionParticipant: {skip: isAnInternalCommand}, _shardsvrCreateCollection: {skip: isAnInternalCommand}, _shardsvrDropDatabase: {skip: isAnInternalCommand}, _shardsvrMovePrimary: {skip: isAnInternalCommand}, |