Merge branch 'main' into REP-5329-retry-more-consistently

Author: FGasper

internal/verifier/check.go

@@ -139,6 +139,10 @@ func (verifier *Verifier) CheckWorker(ctxIn context.Context) error {
 	err := eg.Wait()
 
 	if succeeded {
+		if !errors.Is(err, context.Canceled) {
+			panic("success should mean that err is context.Canceled, not: " + err.Error())
+		}
+
 		err = nil
 	}
 

internal/verifier/migration_verifier.go

@@ -904,12 +904,10 @@ func (verifier *Verifier) doIndexSpecsMatch(ctx context.Context, srcSpec bson.Ra
 		ctx,
 		mongo.Pipeline{
 			{{"$documents", []bson.D{
-				{{"spec", srcSpec}},
-			}}},
-
-			// Add the destination spec.
-			{{"$addFields", bson.D{
-				{"dstSpec", dstSpec},
+				{
+					{"spec", bson.D{{"$literal", srcSpec}}},
+					{"dstSpec", bson.D{{"$literal", dstSpec}}},
+				},
 			}}},
 
 			{{"$unset", lo.Reduce(

internal/verifier/migration_verifier_test.go

@@ -1083,6 +1083,19 @@ func (suite *IntegrationTestSuite) TestVerifierCompareIndexSpecs() {
 			shouldMatch: true,
 		},
 
+		{
+			label: "ignore number types, deep",
+			src: bson.D{
+				{"name", "testIndex"},
+				{"key", bson.M{"foo.bar": float64(123)}},
+			},
+			dst: bson.D{
+				{"name", "testIndex"},
+				{"key", bson.M{"foo.bar": 123}},
+			},
+			shouldMatch: true,
+		},
+
 		{
 			label: "find number differences",
 			src: bson.D{