save

Author: FGasper

internal/util/askserver.go

@@ -0,0 +1,64 @@
+package util
+
+import (
+	"context"
+	"fmt"
+	"slices"
+
+	"github.com/10gen/migration-verifier/mslices"
+	"github.com/10gen/migration-verifier/option"
+	"github.com/pkg/errors"
+	"go.mongodb.org/mongo-driver/bson"
+	"go.mongodb.org/mongo-driver/mongo"
+)
+
+// ServerThinksTheseMatch runs an aggregation on the server that determines
+// whether the server thinks a & b are equal. This allows you, e.g., to
+// ignore BSON type differences for equivalent numbers.
+func ServerThinksTheseMatch(
+	ctx context.Context,
+	client *mongo.Client,
+	a, b any,
+	tinker option.Option[mongo.Pipeline],
+) (bool, error) {
+	fmt.Printf("----------- a: %+v\n\n", a)
+	fmt.Printf("----------- b: %+v\n\n", b)
+
+	pipeline := mongo.Pipeline{
+		{{"$documents", []bson.D{
+			{
+				{"a", bson.D{{"$literal", a}}},
+				{"b", bson.D{{"$literal", b}}},
+			},
+		}}},
+
+		// Now check to be sure that those specs match.
+		{{"$match", bson.D{
+			{"$expr", bson.D{
+				{"$eq", mslices.Of("$a", "$b")},
+			}},
+		}}},
+	}
+
+	if extra, hasExtra := tinker.Get(); hasExtra {
+		pipeline = slices.Insert(
+			pipeline,
+			1,
+			extra...,
+		)
+	}
+
+	cursor, err := client.Database("admin").Aggregate(ctx, pipeline)
+
+	if err == nil {
+		defer cursor.Close(ctx)
+
+		if cursor.Next(ctx) {
+			return true, nil
+		}
+
+		err = cursor.Err()
+	}
+
+	return false, errors.Wrapf(err, "failed to ask server if a (%v) matches b (%v)", a, b)
+}

internal/verifier/check.go

@@ -20,7 +20,7 @@ const (
 	GenerationComplete           GenerationStatus = "complete"
 )
 
-var failedStatus = mapset.NewSet(
+var failedStatuses = mapset.NewSet(
 	verificationTaskFailed,
 	verificationTaskMetadataMismatch,
 )
@@ -406,7 +406,7 @@ func FetchFailedAndIncompleteTasks(ctx context.Context, coll *mongo.Collection,
 		return FailedTasks, IncompleteTasks, err
 	}
 	for _, t := range allTasks {
-		if failedStatus.Contains(t.Status) {
+		if failedStatuses.Contains(t.Status) {
 			FailedTasks = append(FailedTasks, t)
 		} else if t.Status != verificationTaskCompleted {
 			IncompleteTasks = append(IncompleteTasks, t)

internal/verifier/integration_test_suite.go

@@ -5,9 +5,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/10gen/migration-verifier/internal/util"
 	mapset "github.com/deckarep/golang-set/v2"
 	"github.com/pkg/errors"
-	"github.com/samber/lo"
 	"github.com/stretchr/testify/suite"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/mongo"
@@ -16,13 +16,8 @@ import (
 	"go.mongodb.org/mongo-driver/mongo/writeconcern"
 )
 
-type TestTopology string
-
 const (
-	metaDBName                   = "VERIFIER_TEST_META"
-	topologyEnvVar               = "MVTEST_TOPOLOGY"
-	TopologyReplset TestTopology = "replset"
-	TopologySharded TestTopology = "sharded"
+	metaDBName = "VERIFIER_TEST_META"
 )
 
 type IntegrationTestSuite struct {
@@ -139,22 +134,14 @@ func (suite *IntegrationTestSuite) TearDownTest() {
 	}
 }
 
-func (suite *IntegrationTestSuite) GetSrcTopology() TestTopology {
-	hello := struct {
-		Msg string
-	}{}
-
-	resp := suite.srcMongoClient.Database("admin").RunCommand(
+func (suite *IntegrationTestSuite) GetSrcTopology() util.ClusterTopology {
+	clusterInfo, err := util.GetClusterInfo(
 		suite.Context(),
-		bson.D{{"hello", 1}},
-	)
-
-	suite.Require().NoError(
-		resp.Decode(&hello),
-		"should fetch & decode hello",
+		suite.srcMongoClient,
 	)
+	suite.Require().NoError(err, "should fetch src cluster info")
 
-	return lo.Ternary(hello.Msg == "isdbgrid", TopologySharded, "")
+	return clusterInfo.Topology
 }
 
 func (suite *IntegrationTestSuite) BuildVerifier() *Verifier {