simplify

Author: FGasper

internal/verifier/clustertime.go

@@ -36,7 +36,12 @@ func GetNewClusterTime(
 		logger,
 		func(_ *retry.Info) error {
 			var err error
-			clusterTime, err = fetchNewClusterTime(ctx, client)
+			clusterTime, err = runAppendOplogNote(
+				ctx,
+				client,
+				"new ts",
+				option.None[primitive.Timestamp](),
+			)
 			return err
 		},
 	)
@@ -53,7 +58,12 @@ func GetNewClusterTime(
 		logger,
 		func(_ *retry.Info) error {
 			var err error
-			_, err = syncClusterTimeAcrossShards(ctx, client, clusterTime)
+			_, err = runAppendOplogNote(
+				ctx,
+				client,
+				"sync ts",
+				option.Some(clusterTime),
+			)
 			return err
 		},
 	)
@@ -66,66 +76,12 @@ func GetNewClusterTime(
 	return clusterTime, nil
 }
 
-// Use this when we just need the correct cluster time without
-// actually changing any shards’ oplogs.
-func fetchNewClusterTime(
-	ctx context.Context,
-	client *mongo.Client,
-) (primitive.Timestamp, error) {
-	cmd, rawResponse, err := runAppendOplogNote(
-		ctx,
-		client,
-		"expect StaleClusterTime error",
-		option.None[primitive.Timestamp](),
-	)
-
-	// We expect an error here; if we didn't get one then something is
-	// amiss on the server.
-	if err == nil {
-		return primitive.Timestamp{}, errors.Errorf("server request unexpectedly succeeded: %v", cmd)
-	}
-
-	if !util.IsStaleClusterTimeError(err) {
-		return primitive.Timestamp{}, errors.Wrap(
-			err,
-			"unexpected error (expected StaleClusterTime) from request",
-		)
-	}
-
-	return getOpTimeFromRawResponse(rawResponse)
-}
-
-func syncClusterTimeAcrossShards(
-	ctx context.Context,
-	client *mongo.Client,
-	maxTime primitive.Timestamp,
-) (primitive.Timestamp, error) {
-	_, rawResponse, err := runAppendOplogNote(
-		ctx,
-		client,
-		"syncing cluster time",
-		option.Some(maxTime),
-	)
-
-	// If any shard’s cluster time >= maxTime, the mongos will return a
-	// StaleClusterTime error. This particular error doesn’t indicate a
-	// failure, so we ignore it.
-	if err != nil && !util.IsStaleClusterTimeError(err) {
-		return primitive.Timestamp{}, errors.Wrap(
-			err,
-			"failed to append note to oplog",
-		)
-	}
-
-	return getOpTimeFromRawResponse(rawResponse)
-}
-
 func runAppendOplogNote(
 	ctx context.Context,
 	client *mongo.Client,
 	note string,
 	maxClusterTimeOpt option.Option[primitive.Timestamp],
-) (bson.D, bson.Raw, error) {
+) (primitive.Timestamp, error) {
 	cmd := bson.D{
 		{"appendOplogNote", 1},
 		{"data", bson.D{
@@ -144,13 +100,19 @@ func runAppendOplogNote(
 		).
 		RunCommand(ctx, cmd)
 
-	raw, err := resp.Raw()
+	rawResponse, err := resp.Raw()
 
-	return cmd, raw, errors.Wrapf(
-		err,
-		"command (%v) failed unexpectedly",
-		cmd,
-	)
+	// If any shard’s cluster time >= maxTime, the mongos will return a
+	// StaleClusterTime error. This particular error doesn’t indicate a
+	// failure, so we ignore it.
+	if err != nil && !util.IsStaleClusterTimeError(err) {
+		return primitive.Timestamp{}, errors.Wrap(
+			err,
+			"failed to append note to oplog",
+		)
+	}
+
+	return getOpTimeFromRawResponse(rawResponse)
 }
 
 func getOpTimeFromRawResponse(rawResponse bson.Raw) (primitive.Timestamp, error) {

internal/verifier/clustertime_test.go

@@ -5,9 +5,10 @@ import (
 
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
+	"go.mongodb.org/mongo-driver/mongo"
 )
 
-func (suite *IntegrationTestSuite) TestGetClusterTime() {
+func (suite *IntegrationTestSuite) TestGetNewClusterTime() {
 	ctx := context.Background()
 	logger, _ := getLoggerAndWriter("stdout")
 
@@ -17,9 +18,9 @@ func (suite *IntegrationTestSuite) TestGetClusterTime() {
 	_, err = suite.srcMongoClient.
 		Database(suite.DBNameForTest()).
 		Collection("mycoll").
-		InsertOne(ctx, bson.D{})
+		InsertOne(mongo.NewSessionContext(ctx, sess), bson.D{})
 	clusterTimeVal, err := sess.ClusterTime().LookupErr("$clusterTime", "clusterTime")
-	suite.Require().NoError(err)
+	suite.Require().NoError(err, "should extract cluster time from %+v", sess.ClusterTime())
 
 	clusterT, clusterI, ok := clusterTimeVal.TimestampOK()
 	suite.Require().True(ok, "session cluster time (%s: %v) must be a timestamp", clusterTimeVal.Type, clusterTimeVal)