Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 3 insertions, 32 deletions

diff --git a/src/mongo/db/catalog/collection_validation_test.cpp b/src/mongo/db/catalog/collection_validation_test.cpp
index 870c0408565..4ffff4f653b 100644
--- a/src/mongo/db/catalog/collection_validation_test.cpp
+++ b/src/mongo/db/catalog/collection_validation_test.cpp
@@ -47,9 +47,6 @@ namespace {
 const NamespaceString kNss = NamespaceString("test.t");
 
 class CollectionValidationTest : public CatalogTestFixture {
-protected:
-    CollectionValidationTest(Options options = {}) : CatalogTestFixture(std::move(options)) {}
-
 private:
     void setUp() override {
         CatalogTestFixture::setUp();
@@ -61,11 +58,6 @@ private:
     };
 };
 
-class CollectionValidationDiskTest : public CollectionValidationTest {
-protected:
-    CollectionValidationDiskTest() : CollectionValidationTest(Options{}.ephemeral(false)) {}
-};
-
 /**
  * Calls validate on collection kNss with both kValidateFull and kValidateNormal validation levels
  * and verifies the results.
@@ -86,14 +78,8 @@ std::vector<std::pair<BSONObj, ValidateResults>> foregroundValidate(
     for (auto mode : modes) {
         ValidateResults validateResults;
         BSONObjBuilder output;
-        ASSERT_OK(CollectionValidation::validate(opCtx,
-                                                 kNss,
-                                                 mode,
-                                                 repairMode,
-                                                 /*additionalOptions=*/{},
-                                                 &validateResults,
-                                                 &output,
-                                                 /*logDiagnostics=*/false));
+        ASSERT_OK(CollectionValidation::validate(
+            opCtx, kNss, mode, repairMode, &validateResults, &output));
         BSONObj obj = output.obj();
         BSONObjBuilder validateResultsBuilder;
         validateResults.appendToResultObj(&validateResultsBuilder, true /* debugging */);
@@ -159,10 +145,8 @@ void backgroundValidate(OperationContext* opCtx,
                                              kNss,
                                              CollectionValidation::ValidateMode::kBackground,
                                              CollectionValidation::RepairMode::kNone,
-                                             /*additionalOptions=*/{},
                                              &validateResults,
-                                             &output,
-                                             /*logDiagnostics=*/false));
+                                             &output));
     BSONObj obj = output.obj();
 
     ASSERT_EQ(validateResults.valid, valid);
@@ -286,19 +270,6 @@ TEST_F(CollectionValidationTest, ValidateEnforceFastCount) {
                        {CollectionValidation::ValidateMode::kForegroundFullEnforceFastCount});
 }
 
-TEST_F(CollectionValidationDiskTest, ValidateIndexDetailResultsSurfaceVerifyErrors) {
-    FailPointEnableBlock fp{"WTValidateIndexStructuralDamage"};
-    auto opCtx = operationContext();
-    insertDataRange(opCtx, 0, 5);  // initialize collection
-    foregroundValidate(
-        opCtx,
-        /*valid*/ false,
-        /*numRecords*/ std::numeric_limits<int32_t>::min(),           // uninitialized
-        /*numInvalidDocuments*/ std::numeric_limits<int32_t>::min(),  // uninitialized
-        /*numErrors*/ 1,
-        {CollectionValidation::ValidateMode::kForegroundFull});
-}
-
 /**
  * Waits for a parallel running collection validation operation to start and then hang at a
  * failpoint.