Merge branch 'main' into felipe_hide_updatedescription

Author: FGasper

internal/verifier/change_stream_test.go

@@ -282,7 +282,7 @@ func (suite *IntegrationTestSuite) TestCursorKilledResilience() {
 	verifierRunner := RunVerifierCheck(suite.Context(), suite.T(), verifier)
 
 	// wait for generation 0 to end
-	verifierRunner.AwaitGenerationEnd()
+	suite.Require().NoError(verifierRunner.AwaitGenerationEnd())
 
 	const mvName = "Migration Verifier"
 
@@ -376,7 +376,7 @@ func (suite *IntegrationTestSuite) testInsertsBeforeWritesOff(docsCount int) {
 	verifierRunner := RunVerifierCheck(suite.Context(), suite.T(), verifier)
 
 	// wait for generation 0 to end
-	verifierRunner.AwaitGenerationEnd()
+	suite.Require().NoError(verifierRunner.AwaitGenerationEnd())
 
 	docs := lo.RepeatBy(docsCount, func(_ int) bson.D { return bson.D{} })
 	_, err := coll.InsertMany(
@@ -426,7 +426,7 @@ func (suite *IntegrationTestSuite) TestCreateForbidden() {
 	verifierRunner := RunVerifierCheck(suite.Context(), suite.T(), verifier)
 
 	// wait for generation 0 to end
-	verifierRunner.AwaitGenerationEnd()
+	suite.Require().NoError(verifierRunner.AwaitGenerationEnd())
 
 	db := suite.srcMongoClient.Database(suite.DBNameForTest())
 	coll := db.Collection("mycoll")

internal/verifier/check_runner.go

@@ -3,6 +3,8 @@ package verifier
 import (
 	"context"
 	"testing"
+
+	"github.com/pkg/errors"
 )
 
 type CheckRunner struct {
@@ -30,14 +32,25 @@ func RunVerifierCheck(ctx context.Context, t *testing.T, verifier *Verifier) *Ch
 }
 
 // AwaitGenerationEnd blocks until the check’s current generation ends.
-func (cr *CheckRunner) AwaitGenerationEnd() {
-	<-cr.generationDoneChan
+func (cr *CheckRunner) AwaitGenerationEnd() error {
+	select {
+	case <-cr.generationDoneChan:
+		return nil
+	case err := <-cr.checkDoneChan:
+		return errors.Wrap(err, "verifier failed while test awaited generation completion")
+	}
 }
 
 // StartNextGeneration blocks until it can tell the check to start
 // the next generation.
-func (cr *CheckRunner) StartNextGeneration() {
-	cr.doNextGenerationChan <- struct{}{}
+func (cr *CheckRunner) StartNextGeneration() error {
+	select {
+	case cr.doNextGenerationChan <- struct{}{}:
+		return nil
+	case err := <-cr.checkDoneChan:
+		return errors.Wrap(err, "verifier failed while test waited to start next generation")
+	}
+
 }
 
 // Await will await generations and start new ones until the check

internal/verifier/migration_verifier.go

@@ -27,6 +27,7 @@ import (
 	"github.com/10gen/migration-verifier/option"
 	"github.com/olekukonko/tablewriter"
 	"github.com/pkg/errors"
+	"github.com/samber/lo"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo"
@@ -888,6 +889,14 @@ func (verifier *Verifier) doIndexSpecsMatch(ctx context.Context, srcSpec bson.Ra
 		return true, nil
 	}
 
+	var fieldsToRemove = []string{
+		// v4.4 stopped adding “ns” to index fields.
+		"ns",
+
+		// v4.2+ ignores this field.
+		"background",
+	}
+
 	// Next check to see if the only differences are type differences.
 	// (We can safely use $documents here since this is against the metadata
 	// cluster, which we can require to be v5+.)
@@ -904,12 +913,13 @@ func (verifier *Verifier) doIndexSpecsMatch(ctx context.Context, srcSpec bson.Ra
 				{"dstSpec", dstSpec},
 			}}},
 
-			// Remove the “ns” field from both. (NB: 4.4+ don’t create these,
-			// though in-place upgrades may cause them still to exist.)
-			{{"$addFields", bson.D{
-				{"spec.ns", "$$REMOVE"},
-				{"dstSpec.ns", "$$REMOVE"},
-			}}},
+			{{"$unset", lo.Reduce(
+				fieldsToRemove,
+				func(cur []string, field string, _ int) []string {
+					return append(cur, "spec."+field, "dstSpec."+field)
+				},
+				[]string{},
+			)}},
 
 			// Now check to be sure that those specs match.
 			{{"$match", bson.D{

internal/verifier/migration_verifier_test.go

@@ -1245,7 +1245,7 @@ func (suite *IntegrationTestSuite) TestMetadataMismatchAndPartitioning() {
 	suite.Require().NoError(err)
 
 	runner := RunVerifierCheck(ctx, suite.T(), verifier)
-	runner.AwaitGenerationEnd()
+	suite.Require().NoError(runner.AwaitGenerationEnd())
 
 	cursor, err := verifier.verificationTaskCollection().Find(
 		ctx,
@@ -1263,8 +1263,8 @@ func (suite *IntegrationTestSuite) TestMetadataMismatchAndPartitioning() {
 	suite.Require().Equal(verificationTaskVerifyCollection, tasks[1].Type)
 	suite.Require().Equal(verificationTaskMetadataMismatch, tasks[1].Status)
 
-	runner.StartNextGeneration()
-	runner.AwaitGenerationEnd()
+	suite.Require().NoError(runner.StartNextGeneration())
+	suite.Require().NoError(runner.AwaitGenerationEnd())
 
 	cursor, err = verifier.verificationTaskCollection().Find(
 		ctx,
@@ -1310,16 +1310,16 @@ func (suite *IntegrationTestSuite) TestGenerationalRechecking() {
 			suite.T().Logf("TotalTasks is 0 (generation=%d); waiting %s then will run another generation …", verifier.generation, delay)
 
 			time.Sleep(delay)
-			runner.StartNextGeneration()
-			runner.AwaitGenerationEnd()
+			suite.Require().NoError(runner.StartNextGeneration())
+			suite.Require().NoError(runner.AwaitGenerationEnd())
 			status, err = verifier.GetVerificationStatus()
 			suite.Require().NoError(err)
 		}
 		return status
 	}
 
 	// wait for one generation to finish
-	runner.AwaitGenerationEnd()
+	suite.Require().NoError(runner.AwaitGenerationEnd())
 	status := waitForTasks()
 	suite.Require().Equal(VerificationStatus{TotalTasks: 2, FailedTasks: 1, CompletedTasks: 1}, *status)
 
@@ -1328,10 +1328,10 @@ func (suite *IntegrationTestSuite) TestGenerationalRechecking() {
 	suite.Require().NoError(err)
 
 	// tell check to start the next generation
-	runner.StartNextGeneration()
+	suite.Require().NoError(runner.StartNextGeneration())
 
 	// wait for generation to finish
-	runner.AwaitGenerationEnd()
+	suite.Require().NoError(runner.AwaitGenerationEnd())
 	status = waitForTasks()
 	// there should be no failures now, since they are are equivalent at this point in time
 	suite.Require().Equal(VerificationStatus{TotalTasks: 1, CompletedTasks: 1}, *status)
@@ -1341,10 +1341,10 @@ func (suite *IntegrationTestSuite) TestGenerationalRechecking() {
 	suite.Require().NoError(err)
 
 	// tell check to start the next generation
-	runner.StartNextGeneration()
+	suite.Require().NoError(runner.StartNextGeneration())
 
 	// wait for one generation to finish
-	runner.AwaitGenerationEnd()
+	suite.Require().NoError(runner.AwaitGenerationEnd())
 	status = waitForTasks()
 
 	// there should be a failure from the src insert
@@ -1355,10 +1355,10 @@ func (suite *IntegrationTestSuite) TestGenerationalRechecking() {
 	suite.Require().NoError(err)
 
 	// continue
-	runner.StartNextGeneration()
+	suite.Require().NoError(runner.StartNextGeneration())
 
 	// wait for it to finish again, this should be a clean run
-	runner.AwaitGenerationEnd()
+	suite.Require().NoError(runner.AwaitGenerationEnd())
 	status = waitForTasks()
 
 	// there should be no failures now, since they are are equivalent at this point in time
@@ -1493,6 +1493,59 @@ func (suite *IntegrationTestSuite) TestVerifierWithFilter() {
 	<-checkDoneChan
 }
 
+func (suite *IntegrationTestSuite) TestBackgroundInIndexSpec() {
+	ctx := suite.Context()
+
+	srcDB := suite.srcMongoClient.Database(suite.DBNameForTest())
+	dstDB := suite.dstMongoClient.Database(suite.DBNameForTest())
+
+	suite.Require().NoError(
+		srcDB.RunCommand(
+			ctx,
+			bson.D{
+				{"createIndexes", "mycoll"},
+				{"indexes", []bson.D{
+					{
+						{"name", "index1"},
+						{"key", bson.D{{"someField", 1}}},
+					},
+				}},
+			},
+		).Err(),
+	)
+
+	suite.Require().NoError(
+		dstDB.RunCommand(
+			ctx,
+			bson.D{
+				{"createIndexes", "mycoll"},
+				{"indexes", []bson.D{
+					{
+						{"name", "index1"},
+						{"key", bson.D{{"someField", 1}}},
+						{"background", 1},
+					},
+				}},
+			},
+		).Err(),
+	)
+
+	verifier := suite.BuildVerifier()
+	verifier.SetSrcNamespaces([]string{srcDB.Name() + ".mycoll"})
+	verifier.SetDstNamespaces([]string{dstDB.Name() + ".mycoll"})
+	verifier.SetNamespaceMap()
+
+	runner := RunVerifierCheck(ctx, suite.T(), verifier)
+	runner.AwaitGenerationEnd()
+
+	status, err := verifier.GetVerificationStatus()
+	suite.Require().NoError(err)
+	suite.Assert().Zero(
+		status.MetadataMismatchTasks,
+		"no metadata mismatch",
+	)
+}
+
 func (suite *IntegrationTestSuite) TestPartitionWithFilter() {
 	zerolog.SetGlobalLevel(zerolog.DebugLevel)