SERVER-48350 Log cleanup in db/catalog, db/index and db/storage/kv

(cherry picked from commit d7e1821e22d21cc20cd3f6930811f3915193a45d)

9 files changed, 11 insertions, 10 deletions

diff --git a/jstests/multiVersion/genericSetFCVUsage/upgrade_downgrade_while_creating_collection.js b/jstests/multiVersion/genericSetFCVUsage/upgrade_downgrade_while_creating_collection.js
index b7bcf47541a..4a7f2e3c318 100644
--- a/jstests/multiVersion/genericSetFCVUsage/upgrade_downgrade_while_creating_collection.js
+++ b/jstests/multiVersion/genericSetFCVUsage/upgrade_downgrade_while_creating_collection.js
@@ -37,7 +37,8 @@ for (let versions of [{from: lastStableFCV, to: latestFCV}, {from: latestFCV, to
         }, primary.port);
 
         assert.soon(function() {
-            return rawMongoProgramOutput().match(/createCollection.*test.mycoll/);
+            return rawMongoProgramOutput().match(
+                /\"id\":20320.*test.mycoll/);  // Create Collection log
         });
 
         awaitUpgradeFCV = startParallelShell(
diff --git a/jstests/noPassthrough/commit_quorum_does_not_hang_with_initial_sync.js b/jstests/noPassthrough/commit_quorum_does_not_hang_with_initial_sync.js
index ec7f58d0aef..78dc6792e01 100644
--- a/jstests/noPassthrough/commit_quorum_does_not_hang_with_initial_sync.js
+++ b/jstests/noPassthrough/commit_quorum_does_not_hang_with_initial_sync.js
@@ -104,7 +104,7 @@ checkLog.containsJson(secondary, 21184);
 function checkForIndexes(indexes) {
     for (let i = 0; i < indexes.length; i++) {
         checkLog.containsJson(secondary, 20384, {
-            "descriptor": function(obj) {
+            "properties": function(obj) {
                 return obj.name === indexes[i];
             }
         });
diff --git a/jstests/noPassthrough/drop_database_aborts_in_progress_index_builds.js b/jstests/noPassthrough/drop_database_aborts_in_progress_index_builds.js
index d42e87e2eda..61311989176 100644
--- a/jstests/noPassthrough/drop_database_aborts_in_progress_index_builds.js
+++ b/jstests/noPassthrough/drop_database_aborts_in_progress_index_builds.js
@@ -68,7 +68,7 @@ try {
 
     checkLog.contains(
         testDB.getMongo(),
-        "dropDatabase - fail point dropDatabaseHangAfterWaitingForIndexBuilds enabled.");
+        "dropDatabase - fail point dropDatabaseHangAfterWaitingForIndexBuilds enabled");
 
     // Cannot create a collection on the database while it is drop pending.
     assert.commandFailedWithCode(testDB.createCollection("third"), ErrorCodes.DatabaseDropPending);
diff --git a/jstests/noPassthrough/dropdatabase_respect_maxtimems.js b/jstests/noPassthrough/dropdatabase_respect_maxtimems.js
index e3553351f7a..d27c42ef1b9 100644
--- a/jstests/noPassthrough/dropdatabase_respect_maxtimems.js
+++ b/jstests/noPassthrough/dropdatabase_respect_maxtimems.js
@@ -38,7 +38,7 @@ const dropDB = rst.getPrimary().getDB("drop");
 
     checkLog.contains(
         dropDB.getMongo(),
-        "dropDatabase - fail point dropDatabaseHangAfterAllCollectionsDrop enabled. Blocking until fail point is disabled.");
+        "dropDatabase - fail point dropDatabaseHangAfterAllCollectionsDrop enabled. Blocking until fail point is disabled");
 
     let sleepCommand = startParallelShell(() => {
         // Make dropDatabase timeout.
diff --git a/jstests/noPassthrough/index_stepdown_after_init.js b/jstests/noPassthrough/index_stepdown_after_init.js
index ddc9cfd69c5..9590f41d3ed 100644
--- a/jstests/noPassthrough/index_stepdown_after_init.js
+++ b/jstests/noPassthrough/index_stepdown_after_init.js
@@ -37,8 +37,8 @@ const createIdx = IndexBuildTest.startIndexBuild(primary, coll.getFullName(), {a
 
 if (isJsonLog(primary)) {
     checkLog.containsJson(primary, 20384, {
-        ns: coll.getFullName(),
-        descriptor: (desc) => {
+        namespace: coll.getFullName(),
+        properties: (desc) => {
             return desc.name === 'a_1';
         },
     });
diff --git a/jstests/noPassthrough/step_down_during_drop_database.js b/jstests/noPassthrough/step_down_during_drop_database.js
index 40b566de806..f627684ce91 100644
--- a/jstests/noPassthrough/step_down_during_drop_database.js
+++ b/jstests/noPassthrough/step_down_during_drop_database.js
@@ -38,7 +38,7 @@ const awaitShell = startParallelShell(() => {
 // Ensure the dropDatabase command has begun before stepping down.
 checkLog.contains(primary,
                   "dropDatabase - fail point dropDatabaseHangAfterAllCollectionsDrop " +
-                      "enabled. Blocking until fail point is disabled.");
+                      "enabled. Blocking until fail point is disabled");
 
 assert.commandWorked(testDB.adminCommand({replSetStepDown: 60, force: true}));
 replSet.waitForState(primary, ReplSetTest.State.SECONDARY);
diff --git a/jstests/replsets/create_drop_database_different_casing.js b/jstests/replsets/create_drop_database_different_casing.js
index f839c84526a..9b0e201cad1 100644
--- a/jstests/replsets/create_drop_database_different_casing.js
+++ b/jstests/replsets/create_drop_database_different_casing.js
@@ -48,7 +48,7 @@ rst.awaitReplication();
 failPoint.off();
 
 if (isJsonLog(primary)) {
-    checkLog.contains(primary, `dropDatabase - finished","attr":{"db":"${dbNameUpper}"}}`);
+    checkLog.containsJson(primary, 20336, {"db": dbNameUpper});
 } else {
     checkLog.contains(primary, "dropDatabase " + dbNameUpper + " - finished");
 }
diff --git a/jstests/replsets/drop_databases_two_phase.js b/jstests/replsets/drop_databases_two_phase.js
index fbac7c0a721..91c75da7900 100644
--- a/jstests/replsets/drop_databases_two_phase.js
+++ b/jstests/replsets/drop_databases_two_phase.js
@@ -156,7 +156,7 @@ if (isJsonLog(db.getMongo())) {
     checkLog.contains(db.getMongo(),
                       `dropDatabase - dropping collection","attr":{"db":"${
                           dbNameToDrop}","namespace":"${dbNameToDrop}.${collNameToDrop}"`);
-    checkLog.contains(db.getMongo(), 'dropDatabase - finished","attr":{"db":"dbToDrop"');
+    checkLog.containsJson(db.getMongo(), 20336, {"db": "dbToDrop"});
 } else {
     checkLog.contains(db.getMongo(), "dropping collection: " + dbNameToDrop + "." + collNameToDrop);
     checkLog.contains(db.getMongo(), "dropped 1 collection(s)");
diff --git a/jstests/replsets/rollback_drop_database.js b/jstests/replsets/rollback_drop_database.js
index e4783266296..01d3e3c0659 100644
--- a/jstests/replsets/rollback_drop_database.js
+++ b/jstests/replsets/rollback_drop_database.js
@@ -40,7 +40,7 @@ let waitForDropDatabaseToFinish = startParallelShell(dropDatabaseFn, rollbackNod
 
 // Ensure that we've hit the failpoint before moving on.
 checkLog.contains(rollbackNode,
-                  "dropDatabase - fail point dropDatabaseHangBeforeInMemoryDrop enabled.");
+                  "dropDatabase - fail point dropDatabaseHangBeforeInMemoryDrop enabled");
 
 // Wait for the secondary to finish dropping the collection (the last replicated entry).
 // We use the default 10-minute timeout for this.