retryer trim & test tweak

Author: FGasper

internal/retry/retry.go

@@ -42,31 +42,6 @@ func (r *Retryer) RunForUUIDAndTransientErrors(
 	return r.runRetryLoop(ctx, logger, expectedCollName, f, true, true)
 }
 
-// RunForUUIDErrorOnly retries f() for the CollectionUUIDMismatch error only. This should primarily
-// be used to wrap a transaction callback containing an operation that specifies the `collectionUUID`
-// parameter for a collection that may have been:
-//
-//   - Dropped and requires no further action from f().
-//   - Renamed and requires a retry for f() with an updated collection name.
-//
-// We retry only CollectionUUIDMismatch errors for transactions since transactions are already sufficiently
-// retried for transient errors by the driver.
-//
-// The collection's expected name should be provided as the expectedCollName parameter and shouldn't be blank.
-//
-// f() is provided with a collection name string, which is the one that should be used in the body
-// of f() where a collection name is needed. The initial value of this string is expectedCollName.
-//
-// RunForUUIDErrorOnly returns the collection's current name in all cases.
-func (r *Retryer) RunForUUIDErrorOnly(
-	ctx context.Context, logger *logger.Logger, expectedCollName string, f func(*Info, string) error,
-) (string, error) {
-	// Since we're not actually sleeping when checking for UUID/name mismatch
-	// errors, we don't need to provide a real context to handle
-	// cancellations.
-	return r.runRetryLoop(ctx, logger, expectedCollName, f, false, true)
-}
-
 // RunForTransientErrorsOnly retries f() for transient errors only, and
 // does not check for UUID mismatch error.
 //

internal/retry/retryer_test.go

@@ -12,6 +12,8 @@ import (
 )
 
 func (suite *UnitTestSuite) TestRetryer() {
+	suite.T().Parallel()
+
 	retryer := New(DefaultDurationLimit)
 	logger := suite.Logger()
 
@@ -26,7 +28,7 @@ func (suite *UnitTestSuite) TestRetryer() {
 		suite.NoError(err)
 		suite.Equal(0, attemptNumber)
 
-		_, err = retryer.RunForUUIDErrorOnly(suite.Context(), logger, "foo", f)
+		_, err = retryer.RunForUUIDAndTransientErrors(suite.Context(), logger, "foo", f)
 		suite.NoError(err)
 		suite.Equal(0, attemptNumber)
 
@@ -92,7 +94,7 @@ func (suite *UnitTestSuite) TestRetryer() {
 			}
 			return nil
 		}
-		_, err := retryer.RunForUUIDErrorOnly(suite.Context(), logger, "bar", f)
+		_, err := retryer.RunForUUIDAndTransientErrors(suite.Context(), logger, "bar", f)
 		suite.NoError(err)
 		suite.Equal(attemptLimit/2, attemptNumber)
 	})
@@ -109,7 +111,7 @@ func (suite *UnitTestSuite) TestRetryer() {
 				Raw:  bson.Raw(raw),
 			}
 		}
-		_, err := retryer.RunForUUIDErrorOnly(suite.Context(), logger, "bar", f)
+		_, err := retryer.RunForUUIDAndTransientErrors(suite.Context(), logger, "bar", f)
 		suite.NoError(err)
 		// We only did one retry because the actual collection name matched the
 		// previous attempt.
@@ -118,24 +120,28 @@ func (suite *UnitTestSuite) TestRetryer() {
 }
 
 func (suite *UnitTestSuite) TestRetryerDurationLimitIsZero() {
+	suite.T().Parallel()
+
 	retryer := New(0)
 
 	attemptNumber := -1
 	cmdErr := mongo.CommandError{
-		Labels: []string{"NetworkError"},
-		Name:   "NetworkError",
+		Labels: []string{"SomethingWeird"},
+		Name:   "SomethingWeird",
 	}
-	f := func(ri *Info, _ string) error {
+	f := func(ri *Info) error {
 		attemptNumber = ri.attemptNumber
 		return cmdErr
 	}
 
-	_, err := retryer.RunForUUIDErrorOnly(suite.Context(), suite.Logger(), "bar", f)
+	err := retryer.RunForTransientErrorsOnly(suite.Context(), suite.Logger(), f)
 	suite.Equal(cmdErr, err)
 	suite.Equal(0, attemptNumber)
 }
 
 func (suite *UnitTestSuite) TestRetryerDurationReset() {
+	suite.T().Parallel()
+
 	retryer := New(DefaultDurationLimit)
 	logger := suite.Logger()
 
@@ -192,6 +198,8 @@ func (suite *UnitTestSuite) TestRetryerDurationReset() {
 }
 
 func (suite *UnitTestSuite) TestCancelViaContext() {
+	suite.T().Parallel()
+
 	retryer := New(DefaultDurationLimit)
 	logger := suite.Logger()
 
@@ -222,6 +230,8 @@ func (suite *UnitTestSuite) TestCancelViaContext() {
 }
 
 func (suite *UnitTestSuite) TestRetryerAdditionalErrorCodes() {
+	suite.T().Parallel()
+
 	logger := suite.Logger()
 
 	customError := mongo.CommandError{
@@ -271,6 +281,8 @@ func (suite *UnitTestSuite) TestRetryerAdditionalErrorCodes() {
 }
 
 func (suite *UnitTestSuite) TestRetryerWithEmptyCollectionName() {
+	suite.T().Parallel()
+
 	retryer := New(DefaultDurationLimit)
 	emptyCollNameError := errors.New("Empty collection name")
 	f := func(_ *Info, collName string) error {
@@ -280,13 +292,15 @@ func (suite *UnitTestSuite) TestRetryerWithEmptyCollectionName() {
 		return nil
 	}
 
-	name, err := retryer.RunForUUIDErrorOnly(suite.Context(), suite.Logger(), "", f)
+	name, err := retryer.RunForUUIDAndTransientErrors(suite.Context(), suite.Logger(), "", f)
 	suite.NoError(err)
 	suite.Equal("", name)
 }
 
 // Test fix for REP-4197
 func (suite *UnitTestSuite) TestV50RetryerWithUUIDNotSupportedError() {
+	suite.T().Parallel()
+
 	retryer := New(0)
 
 	attemptNumber := 0
@@ -312,6 +326,8 @@ func (suite *UnitTestSuite) TestV50RetryerWithUUIDNotSupportedError() {
 }
 
 func (suite *UnitTestSuite) TestPreV50RetryerWithUUIDNotSupportedError() {
+	suite.T().Parallel()
+
 	retryer := New(0)
 
 	attemptNumber := 0