SERVER-74045 Allow turning on diagnostic log messages for validate

(cherry picked from commit 7230a2aa4f4eedcaa6a0c85c7c14bcb29c63ae93)

13 files changed, 115 insertions, 85 deletions

diff --git a/src/mongo/db/catalog/collection_validation.cpp b/src/mongo/db/catalog/collection_validation.cpp
index 952f1c75b54..31ee797b02c 100644
--- a/src/mongo/db/catalog/collection_validation.cpp
+++ b/src/mongo/db/catalog/collection_validation.cpp
@@ -459,12 +459,12 @@ Status validate(OperationContext* opCtx,
                 RepairMode repairMode,
                 ValidateResults* results,
                 BSONObjBuilder* output,
-                bool turnOnExtraLoggingForTest) {
+                bool logDiagnostics) {
     invariant(!opCtx->lockState()->isLocked() || storageGlobalParams.repair);
 
     // This is deliberately outside of the try-catch block, so that any errors thrown in the
     // constructor fail the cmd, as opposed to returning OK with valid:false.
-    ValidateState validateState(opCtx, nss, mode, repairMode, turnOnExtraLoggingForTest);
+    ValidateState validateState(opCtx, nss, mode, repairMode, logDiagnostics);
 
     const auto replCoord = repl::ReplicationCoordinator::get(opCtx);
     // Check whether we are allowed to read from this node after acquiring our locks. If we are
diff --git a/src/mongo/db/catalog/collection_validation.h b/src/mongo/db/catalog/collection_validation.h
index d362b5a113d..d0597f2198d 100644
--- a/src/mongo/db/catalog/collection_validation.h
+++ b/src/mongo/db/catalog/collection_validation.h
@@ -106,7 +106,7 @@ Status validate(OperationContext* opCtx,
                 RepairMode repairMode,
                 ValidateResults* results,
                 BSONObjBuilder* output,
-                bool turnOnExtraLoggingForTest = false);
+                bool logDiagnostics);
 
 /**
  * Checks whether a failpoint has been hit in the above validate() code..
diff --git a/src/mongo/db/catalog/collection_validation_test.cpp b/src/mongo/db/catalog/collection_validation_test.cpp
index b2284fdee82..619f505866d 100644
--- a/src/mongo/db/catalog/collection_validation_test.cpp
+++ b/src/mongo/db/catalog/collection_validation_test.cpp
@@ -91,8 +91,13 @@ std::vector<std::pair<BSONObj, ValidateResults>> foregroundValidate(
     for (auto mode : modes) {
         ValidateResults validateResults;
         BSONObjBuilder output;
-        ASSERT_OK(CollectionValidation::validate(
-            opCtx, nss, mode, repairMode, &validateResults, &output));
+        ASSERT_OK(CollectionValidation::validate(opCtx,
+                                                 nss,
+                                                 mode,
+                                                 repairMode,
+                                                 &validateResults,
+                                                 &output,
+                                                 /*logDiagnostics=*/false));
         BSONObj obj = output.obj();
         BSONObjBuilder validateResultsBuilder;
         validateResults.appendToResultObj(&validateResultsBuilder, true /* debugging */);
@@ -163,7 +168,8 @@ std::vector<std::pair<BSONObj, ValidateResults>> backgroundValidate(const Namesp
                                              CollectionValidation::ValidateMode::kBackground,
                                              CollectionValidation::RepairMode::kNone,
                                              &validateResults,
-                                             &output));
+                                             &output,
+                                             /*logDiagnostics=*/false));
     BSONObj obj = output.obj();
 
     ASSERT_EQ(validateResults.valid, valid);
diff --git a/src/mongo/db/catalog/column_index_consistency_test.cpp b/src/mongo/db/catalog/column_index_consistency_test.cpp
index 0199b9627e1..ee8dbcf5487 100644
--- a/src/mongo/db/catalog/column_index_consistency_test.cpp
+++ b/src/mongo/db/catalog/column_index_consistency_test.cpp
@@ -61,7 +61,8 @@ protected:
             opCtx,
             kNss,
             CollectionValidation::ValidateMode::kForeground,
-            CollectionValidation::RepairMode::kNone);
+            CollectionValidation::RepairMode::kNone,
+            /*logDiagnostics=*/false);
     };
 
     void tearDown() override {
diff --git a/src/mongo/db/catalog/index_consistency.cpp b/src/mongo/db/catalog/index_consistency.cpp
index 19258cbe3f2..c031905c1b0 100644
--- a/src/mongo/db/catalog/index_consistency.cpp
+++ b/src/mongo/db/catalog/index_consistency.cpp
@@ -127,7 +127,7 @@ KeyStringIndexConsistency::KeyStringIndexConsistency(
 void KeyStringIndexConsistency::addMultikeyMetadataPath(const KeyString::Value& ks,
                                                         IndexInfo* indexInfo) {
     auto hash = _hashKeyString(ks, indexInfo->indexNameHash);
-    if (MONGO_unlikely(_validateState->extraLoggingForTest())) {
+    if (MONGO_unlikely(_validateState->logDiagnostics())) {
         LOGV2(6208500,
               "[validate](multikeyMetadataPath) Adding with the hash",
               "hash"_attr = hash,
@@ -139,7 +139,7 @@ void KeyStringIndexConsistency::addMultikeyMetadataPath(const KeyString::Value&
 void KeyStringIndexConsistency::removeMultikeyMetadataPath(const KeyString::Value& ks,
                                                            IndexInfo* indexInfo) {
     auto hash = _hashKeyString(ks, indexInfo->indexNameHash);
-    if (MONGO_unlikely(_validateState->extraLoggingForTest())) {
+    if (MONGO_unlikely(_validateState->logDiagnostics())) {
         LOGV2(6208501,
               "[validate](multikeyMetadataPath) Removing with the hash",
               "hash"_attr = hash,
@@ -153,9 +153,26 @@ size_t KeyStringIndexConsistency::getMultikeyMetadataPathCount(IndexInfo* indexI
 }
 
 bool KeyStringIndexConsistency::haveEntryMismatch() const {
-    return std::any_of(_indexKeyBuckets.begin(),
-                       _indexKeyBuckets.end(),
-                       [](const IndexKeyBucket& bucket) -> bool { return bucket.indexKeyCount; });
+    bool haveMismatch =
+        std::any_of(_indexKeyBuckets.begin(),
+                    _indexKeyBuckets.end(),
+                    [](const IndexKeyBucket& bucket) -> bool { return bucket.indexKeyCount; });
+
+    if (haveMismatch && _validateState->logDiagnostics()) {
+        for (size_t i = 0; i < _indexKeyBuckets.size(); i++) {
+            if (_indexKeyBuckets[i].indexKeyCount == 0) {
+                continue;
+            }
+
+            LOGV2(7404500,
+                  "[validate](bucket entry mismatch)",
+                  "hash"_attr = i,
+                  "indexKeyCount"_attr = _indexKeyBuckets[i].indexKeyCount,
+                  "bucketBytesSize"_attr = _indexKeyBuckets[i].bucketSizeBytes);
+        }
+    }
+
+    return haveMismatch;
 }
 
 void KeyStringIndexConsistency::repairIndexEntries(OperationContext* opCtx,
@@ -376,7 +393,7 @@ void KeyStringIndexConsistency::addDocKey(OperationContext* opCtx,
         upper.bucketSizeBytes += ks.getSize();
         indexInfo->numRecords++;
 
-        if (MONGO_unlikely(_validateState->extraLoggingForTest())) {
+        if (MONGO_unlikely(_validateState->logDiagnostics())) {
             LOGV2(4666602,
                   "[validate](record) Adding with hashes",
                   "hashUpper"_attr = hashUpper,
@@ -434,7 +451,7 @@ void KeyStringIndexConsistency::addIndexKey(OperationContext* opCtx,
         upper.bucketSizeBytes += ks.getSize();
         indexInfo->numKeys++;
 
-        if (MONGO_unlikely(_validateState->extraLoggingForTest())) {
+        if (MONGO_unlikely(_validateState->logDiagnostics())) {
             LOGV2(4666603,
                   "[validate](index) Adding with hashes",
                   "hashUpper"_attr = hashUpper,
diff --git a/src/mongo/db/catalog/validate_adaptor.cpp b/src/mongo/db/catalog/validate_adaptor.cpp
index 5958712b5e1..04f00e59781 100644
--- a/src/mongo/db/catalog/validate_adaptor.cpp
+++ b/src/mongo/db/catalog/validate_adaptor.cpp
@@ -560,7 +560,7 @@ Status ValidateAdaptor::validateRecord(OperationContext* opCtx,
     BSONObj recordBson = record.toBson();
     *dataSize = recordBson.objsize();
 
-    if (MONGO_unlikely(_validateState->extraLoggingForTest())) {
+    if (MONGO_unlikely(_validateState->logDiagnostics())) {
         LOGV2(4666601, "[validate]", "recordId"_attr = recordId, "recordData"_attr = recordBson);
     }
 
diff --git a/src/mongo/db/catalog/validate_state.cpp b/src/mongo/db/catalog/validate_state.cpp
index ba5f45a1838..5f4f514e122 100644
--- a/src/mongo/db/catalog/validate_state.cpp
+++ b/src/mongo/db/catalog/validate_state.cpp
@@ -58,12 +58,12 @@ ValidateState::ValidateState(OperationContext* opCtx,
                              const NamespaceString& nss,
                              ValidateMode mode,
                              RepairMode repairMode,
-                             bool turnOnExtraLoggingForTest)
+                             bool logDiagnostics)
     : _nss(nss),
       _mode(mode),
       _repairMode(repairMode),
       _dataThrottle(opCtx),
-      _extraLoggingForTest(turnOnExtraLoggingForTest) {
+      _logDiagnostics(logDiagnostics) {
 
     // Subsequent re-locks will use the UUID when 'background' is true.
     if (isBackground()) {
diff --git a/src/mongo/db/catalog/validate_state.h b/src/mongo/db/catalog/validate_state.h
index fa99e652567..77c6d376fc4 100644
--- a/src/mongo/db/catalog/validate_state.h
+++ b/src/mongo/db/catalog/validate_state.h
@@ -52,15 +52,11 @@ class ValidateState {
     ValidateState& operator=(const ValidateState&) = delete;
 
 public:
-    /**
-     * 'turnOnExtraLoggingForTest' turns on extra logging for test debugging. This parameter is for
-     * unit testing only.
-     */
     ValidateState(OperationContext* opCtx,
                   const NamespaceString& nss,
                   ValidateMode mode,
                   RepairMode repairMode,
-                  bool turnOnExtraLoggingForTest = false);
+                  bool logDiagnostics);
 
     const NamespaceString& nss() const {
         return _nss;
@@ -190,11 +186,9 @@ public:
 
     /**
      * Indicates whether extra logging should occur during validation.
-     *
-     * This is for unit testing only. Intended to improve diagnosibility.
      */
-    bool extraLoggingForTest() {
-        return _extraLoggingForTest;
+    bool logDiagnostics() {
+        return _logDiagnostics;
     }
 
     boost::optional<Timestamp> getValidateTimestamp() {
@@ -278,8 +272,8 @@ private:
     // Used to detect when the catalog is re-opened while yielding locks.
     uint64_t _catalogGeneration;
 
-    // Can be set by unit tests to obtain better insight into what validate sees/does.
-    bool _extraLoggingForTest;
+    // Can be set to obtain better insight into what validate sees/does.
+    bool _logDiagnostics;
 
     boost::optional<Timestamp> _validateTs = boost::none;
 };
diff --git a/src/mongo/db/catalog/validate_state_test.cpp b/src/mongo/db/catalog/validate_state_test.cpp
index caababd402a..577c110db8a 100644
--- a/src/mongo/db/catalog/validate_state_test.cpp
+++ b/src/mongo/db/catalog/validate_state_test.cpp
@@ -166,7 +166,8 @@ TEST_F(ValidateStateTest, NonExistentCollectionShouldThrowNamespaceNotFoundError
         CollectionValidation::ValidateState(opCtx,
                                             kNss,
                                             CollectionValidation::ValidateMode::kForeground,
-                                            CollectionValidation::RepairMode::kNone),
+                                            CollectionValidation::RepairMode::kNone,
+                                            /*logDiagnostics=*/false),
         AssertionException,
         ErrorCodes::NamespaceNotFound);
 
@@ -174,7 +175,8 @@ TEST_F(ValidateStateTest, NonExistentCollectionShouldThrowNamespaceNotFoundError
         CollectionValidation::ValidateState(opCtx,
                                             kNss,
                                             CollectionValidation::ValidateMode::kBackground,
-                                            CollectionValidation::RepairMode::kNone),
+                                            CollectionValidation::RepairMode::kNone,
+                                            /*logDiagnostics=*/false),
         AssertionException,
         ErrorCodes::NamespaceNotFound);
 }
@@ -196,7 +198,8 @@ TEST_F(ValidateStateDiskTest, UncheckpointedCollectionShouldThrowCursorNotFoundE
         opCtx,
         kNss,
         CollectionValidation::ValidateMode::kBackground,
-        CollectionValidation::RepairMode::kNone);
+        CollectionValidation::RepairMode::kNone,
+        /*logDiagnostics=*/false);
     ASSERT_THROWS_CODE(
         validateState.initializeCursors(opCtx), AssertionException, ErrorCodes::CursorNotFound);
 }
@@ -221,7 +224,8 @@ TEST_F(ValidateStateTest, OpenCursorsOnAllIndexes) {
             opCtx,
             kNss,
             CollectionValidation::ValidateMode::kForeground,
-            CollectionValidation::RepairMode::kNone);
+            CollectionValidation::RepairMode::kNone,
+            /*logDiagnostics=*/false);
         validateState.initializeCursors(opCtx);
 
         // Make sure all of the indexes were found and cursors opened against them. Including the
@@ -239,7 +243,8 @@ TEST_F(ValidateStateTest, OpenCursorsOnAllIndexes) {
         opCtx,
         kNss,
         CollectionValidation::ValidateMode::kForeground,
-        CollectionValidation::RepairMode::kNone);
+        CollectionValidation::RepairMode::kNone,
+        /*logDiagnostics=*/false);
     validateState.initializeCursors(opCtx);
     ASSERT_EQ(validateState.getIndexes().size(), 5);
 }
@@ -266,7 +271,8 @@ TEST_F(ValidateStateDiskTest, OpenCursorsOnCheckpointedIndexes) {
         opCtx,
         kNss,
         CollectionValidation::ValidateMode::kBackground,
-        CollectionValidation::RepairMode::kNone);
+        CollectionValidation::RepairMode::kNone,
+        /*logDiagnostics=*/false);
     validateState.initializeCursors(opCtx);
 
     // Make sure the uncheckpoint'ed indexes are not found.
@@ -312,7 +318,8 @@ TEST_F(ValidateStateDiskTest, OpenCursorsOnConsistentlyCheckpointedIndexes) {
         opCtx,
         kNss,
         CollectionValidation::ValidateMode::kBackground,
-        CollectionValidation::RepairMode::kNone);
+        CollectionValidation::RepairMode::kNone,
+        /*logDiagnostics=*/false);
     validateState.initializeCursors(opCtx);
     ASSERT_EQ(validateState.getIndexes().size(), 3);
 }
@@ -346,7 +353,8 @@ TEST_F(ValidateStateDiskTest, CursorsAreNotOpenedAgainstCheckpointedIndexesThatW
             opCtx,
             kNss,
             CollectionValidation::ValidateMode::kBackground,
-            CollectionValidation::RepairMode::kNone);
+            CollectionValidation::RepairMode::kNone,
+            /*logDiagnostics=*/false);
         validateState.initializeCursors(opCtx);
         ASSERT_EQ(validateState.getIndexes().size(), 3);
     }
@@ -359,7 +367,8 @@ TEST_F(ValidateStateDiskTest, CursorsAreNotOpenedAgainstCheckpointedIndexesThatW
         opCtx,
         kNss,
         CollectionValidation::ValidateMode::kBackground,
-        CollectionValidation::RepairMode::kNone);
+        CollectionValidation::RepairMode::kNone,
+        /*logDiagnostics=*/false);
     validateState.initializeCursors(opCtx);
     ASSERT_EQ(validateState.getIndexes().size(), 3);
 }
diff --git a/src/mongo/db/commands/validate.cpp b/src/mongo/db/commands/validate.cpp
index 4638d080553..69ce5f0eb27 100644
--- a/src/mongo/db/commands/validate.cpp
+++ b/src/mongo/db/commands/validate.cpp
@@ -141,6 +141,7 @@ public:
 
         const NamespaceString nss(CommandHelpers::parseNsCollectionRequired(dbName, cmdObj));
         bool background = cmdObj["background"].trueValue();
+        bool logDiagnostics = cmdObj["logDiagnostics"].trueValue();
 
         const bool fullValidate = cmdObj["full"].trueValue();
         if (background && fullValidate) {
@@ -299,8 +300,8 @@ public:
         }
 
         ValidateResults validateResults;
-        Status status =
-            CollectionValidation::validate(opCtx, nss, mode, repairMode, &validateResults, &result);
+        Status status = CollectionValidation::validate(
+            opCtx, nss, mode, repairMode, &validateResults, &result, logDiagnostics);
         if (!status.isOK()) {
             return CommandHelpers::appendCommandStatusNoThrow(result, status);
         }
diff --git a/src/mongo/db/repair.cpp b/src/mongo/db/repair.cpp
index 9b64e51f1d4..46b22c064e8 100644
--- a/src/mongo/db/repair.cpp
+++ b/src/mongo/db/repair.cpp
@@ -240,7 +240,8 @@ Status repairCollection(OperationContext* opCtx,
                                        CollectionValidation::ValidateMode::kForegroundFullIndexOnly,
                                        CollectionValidation::RepairMode::kFixErrors,
                                        &validateResults,
-                                       &output);
+                                       &output,
+                                       /*logDiagnostics=*/false);
     if (!status.isOK()) {
         return status;
     }
diff --git a/src/mongo/db/repl/idempotency_test_fixture.cpp b/src/mongo/db/repl/idempotency_test_fixture.cpp
index 43fae2f3382..e14db65a6ca 100644
--- a/src/mongo/db/repl/idempotency_test_fixture.cpp
+++ b/src/mongo/db/repl/idempotency_test_fixture.cpp
@@ -409,7 +409,8 @@ CollectionState IdempotencyTest::validate(const NamespaceString& nss) {
                                            CollectionValidation::ValidateMode::kForegroundFull,
                                            CollectionValidation::RepairMode::kNone,
                                            &validateResults,
-                                           &bob));
+                                           &bob,
+                                           /*logDiagnostics=*/false));
         ASSERT_TRUE(validateResults.valid);
     }
 
diff --git a/src/mongo/dbtests/validate_tests.cpp b/src/mongo/dbtests/validate_tests.cpp
index 59daa44ea2a..df7d82f8ee4 100644
--- a/src/mongo/dbtests/validate_tests.cpp
+++ b/src/mongo/dbtests/validate_tests.cpp
@@ -48,7 +48,7 @@ namespace ValidateTests {
 namespace {
 
 const auto kIndexVersion = IndexDescriptor::IndexVersion::kV2;
-const bool kTurnOnExtraLoggingForTest = true;
+const bool kLogDiagnostics = true;
 
 std::size_t omitTransientWarningsFromCount(const ValidateResults& results) {
     return std::count_if(
@@ -150,7 +150,7 @@ protected:
 
         forceCheckpoint(_background);
         ASSERT_OK(CollectionValidation::validate(
-            &_opCtx, _nss, mode, repairMode, &results, &output, kTurnOnExtraLoggingForTest));
+            &_opCtx, _nss, mode, repairMode, &results, &output, kLogDiagnostics));
 
         //  Check if errors are reported if and only if valid is set to false.
         ASSERT_EQ(results.valid, results.errors.empty());
@@ -1267,7 +1267,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -1387,7 +1387,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -1478,7 +1478,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -1593,7 +1593,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -1622,7 +1622,7 @@ public:
                                                CollectionValidation::RepairMode::kFixErrors,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -1658,7 +1658,7 @@ public:
                                                CollectionValidation::RepairMode::kFixErrors,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -1777,7 +1777,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -1808,7 +1808,7 @@ public:
                                                CollectionValidation::RepairMode::kFixErrors,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -1840,7 +1840,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -1930,7 +1930,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -1961,7 +1961,7 @@ public:
                                                CollectionValidation::RepairMode::kFixErrors,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -1992,7 +1992,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -2144,7 +2144,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -2174,7 +2174,7 @@ public:
                                                CollectionValidation::RepairMode::kFixErrors,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -2227,7 +2227,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -2399,7 +2399,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -2432,7 +2432,7 @@ public:
                                                CollectionValidation::RepairMode::kFixErrors,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -2486,7 +2486,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -2747,7 +2747,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -2777,7 +2777,7 @@ public:
                                                CollectionValidation::RepairMode::kFixErrors,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -2831,7 +2831,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -2957,7 +2957,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -2988,7 +2988,7 @@ public:
                                                CollectionValidation::RepairMode::kFixErrors,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -3020,7 +3020,7 @@ public:
                                                CollectionValidation::RepairMode::kFixErrors,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -3434,7 +3434,7 @@ public:
                                                      CollectionValidation::RepairMode::kNone,
                                                      &results,
                                                      &output,
-                                                     kTurnOnExtraLoggingForTest));
+                                                     kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -3502,7 +3502,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -3533,7 +3533,7 @@ public:
                                                CollectionValidation::RepairMode::kFixErrors,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -3568,7 +3568,7 @@ public:
                                                CollectionValidation::RepairMode::kFixErrors,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -3599,7 +3599,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -3766,7 +3766,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -3795,7 +3795,7 @@ public:
                                                CollectionValidation::RepairMode::kFixErrors,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -3825,7 +3825,7 @@ public:
                                                CollectionValidation::RepairMode::kFixErrors,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -3973,7 +3973,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -4002,7 +4002,7 @@ public:
                                                CollectionValidation::RepairMode::kFixErrors,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -4031,7 +4031,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -4139,7 +4139,7 @@ public:
                                                CollectionValidation::RepairMode::kAdjustMultikey,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -4172,7 +4172,7 @@ public:
                                                CollectionValidation::RepairMode::kAdjustMultikey,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -4245,7 +4245,7 @@ public:
                                                      CollectionValidation::RepairMode::kNone,
                                                      &results,
                                                      &output,
-                                                     kTurnOnExtraLoggingForTest));
+                                                     kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -4359,7 +4359,7 @@ public:
                                                      CollectionValidation::RepairMode::kNone,
                                                      &results,
                                                      &output,
-                                                     kTurnOnExtraLoggingForTest));
+                                                     kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -4470,7 +4470,7 @@ public:
                                                      CollectionValidation::RepairMode::kNone,
                                                      &results,
                                                      &output,
-                                                     kTurnOnExtraLoggingForTest));
+                                                     kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -4510,7 +4510,7 @@ public:
                                                      CollectionValidation::RepairMode::kFixErrors,
                                                      &results,
                                                      &output,
-                                                     kTurnOnExtraLoggingForTest));
+                                                     kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);
@@ -4637,7 +4637,7 @@ public:
                                                CollectionValidation::RepairMode::kNone,
                                                &results,
                                                &output,
-                                               kTurnOnExtraLoggingForTest));
+                                               kLogDiagnostics));
 
             ScopeGuard dumpOnErrorGuard([&] {
                 StorageDebugUtil::printValidateResults(results);