mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-30 00:56:44 +01:00
Code Issues Releases Activity

SERVER-46235 convert drop_collections_two_phase_rename_drop_target.js to use checkLog.containsJson()

Browse Source
This commit is contained in:
Benety Goh 2020-03-02 16:13:07 -05:00 committed by Evergreen Agent
parent 82833b4186
commit fa5f8749a1
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jstests/replsets/drop_collections_two_phase_rename_drop_target.js
View File

@ -6,6 +6,7 @@
(function() {
'use strict';
load("jstests/libs/logv2_helpers.js");
load('jstests/replsets/libs/two_phase_drops.js'); // For TwoPhaseDropCollectionTest.
// Return a list of all indexes for a given collection. Use 'args' as the
@ -103,7 +104,11 @@ try {
// Confirm in the logs that the renameCollection dropped the target collection on the
// secondary using two phase collection drop.
checkLog.contains(secondary, new RegExp('dropCollection:.*' + toColl.getFullName()));
if (isJsonLog(secondary)) {
checkLog.containsJson(secondary, 20315, {nss: toColl.getFullName()});
} else {
checkLog.contains(secondary, new RegExp('dropCollection:.*' + toColl.getFullName()));
}
// Rename target collection back to source collection. This helps to ensure the collection
// metadata is updated correctly on both primary and secondary.