diff options
4 files changed, 5 insertions, 8 deletions
diff --git a/buildscripts/resmokeconfig/suites/no_passthrough.yml b/buildscripts/resmokeconfig/suites/no_passthrough.yml index 656024c289f..709f8297384 100644 --- a/buildscripts/resmokeconfig/suites/no_passthrough.yml +++ b/buildscripts/resmokeconfig/suites/no_passthrough.yml @@ -11,9 +11,6 @@ selector: # Disable inmem_full as per SERVER-27014 - jstests/noPassthrough/inmem_full.js # Disable incompatible with json logging per SERVER-46235 - - jstests/noPassthrough/currentop_secondary_slow_op.js - - jstests/noPassthrough/index_secondary_commit_after_scan_error.js - - jstests/noPassthrough/indexbg_killop_primary_after_init.js - jstests/noPassthrough/latency_includes_lock_acquisition_time.js - jstests/noPassthrough/log_and_profile_query_hash.js - jstests/noPassthrough/log_format_slowms_samplerate_loglevel.js diff --git a/jstests/noPassthrough/currentop_secondary_slow_op.js b/jstests/noPassthrough/currentop_secondary_slow_op.js index 66e83520056..419153105aa 100644 --- a/jstests/noPassthrough/currentop_secondary_slow_op.js +++ b/jstests/noPassthrough/currentop_secondary_slow_op.js @@ -40,8 +40,9 @@ assert.commandWorked(secondaryDB.adminCommand({ try { assert.commandWorked(coll.insert({_id: 'b'})); - checkLog.contains(secondary, - 'hangAfterCollectionInserts fail point enabled for ' + coll.getFullName()); + checkLog.contains( + secondary, + new RegExp(`hangAfterCollectionInserts fail point enabled for.*${coll.getFullName()}`)); jsTestLog('Running currentOp() with slow operation logging.'); // Lower slowms to make currentOp() log slow operation while the secondary is procesing the diff --git a/jstests/noPassthrough/index_secondary_commit_after_scan_error.js b/jstests/noPassthrough/index_secondary_commit_after_scan_error.js index 1130044a1b0..d502e297fa1 100644 --- a/jstests/noPassthrough/index_secondary_commit_after_scan_error.js +++ b/jstests/noPassthrough/index_secondary_commit_after_scan_error.js @@ -86,7 +86,7 @@ assert.soon(function() { // Secondary should crash on receiving the unexpected commitIndexBuild oplog entry. const fassertProcessExitCode = _isWindows() ? MongoRunner.EXIT_ABRUPT : MongoRunner.EXIT_ABORT; assert.eq(fassertProcessExitCode, res.exitCode); -assert(rawMongoProgramOutput().match('Fatal assertion 51101 OperationFailed: Index build:'), +assert(rawMongoProgramOutput().match('Fatal assertion.*51101.*OperationFailed: Index build:'), 'Index build should have aborted secondary due to unexpected commitIndexBuild oplog entry.'); // Check indexes on primary. diff --git a/jstests/noPassthrough/indexbg_killop_primary_after_init.js b/jstests/noPassthrough/indexbg_killop_primary_after_init.js index 5ac9cde7ceb..93b8fe1a837 100644 --- a/jstests/noPassthrough/indexbg_killop_primary_after_init.js +++ b/jstests/noPassthrough/indexbg_killop_primary_after_init.js @@ -61,8 +61,7 @@ IndexBuildTest.waitForIndexBuildToStop(testDB); const exitCode = createIdx({checkExitSuccess: false}); assert.neq(0, exitCode, 'expected shell to exit abnormally due to index build being terminated'); -checkLog.contains( - primary, /IndexBuildAborted: Index build aborted: |Index build aborted:.*IndexBuildAborted/); +checkLog.contains(primary, /IndexBuildAborted:?.*Index build aborted: /); // Check that no new index has been created. This verifies that the index build was aborted // rather than successfully completed. |