GODRIVER-3444 Remove error parameter from CalculateMaxTimeMS

Author: prestonvasquez

internal/driverutil/operation.go

@@ -38,34 +38,27 @@ const (
 	BulkWriteOp         = "bulkWrite"         // BulkWriteOp is the name for client-level bulk write
 )
 
-func CalculateMaxTimeMS(ctx context.Context, rttMin time.Duration, rttStats string, err error) (int64, error) {
+func CalculateMaxTimeMS(ctx context.Context, rttMin time.Duration) (int64, bool) {
 	deadline, ok := ctx.Deadline()
 	if !ok {
-		return 0, nil
+		return 0, true
 	}
 
 	remainingTimeout := time.Until(deadline)
+	fmt.Println(remainingTimeout, rttMin)
 
 	// Always round up to the next millisecond value so we never truncate the calculated
 	// maxTimeMS value (e.g. 400 microseconds evaluates to 1ms, not 0ms).
 	maxTimeMS := int64((remainingTimeout - rttMin) / time.Millisecond)
-	if maxTimeMS <= 0 {
-		return 0, fmt.Errorf(
-			"remaining time %v until context deadline is less than or equal to min network round-trip time %v (%v): %w",
-			remainingTimeout,
-			rttMin,
-			rttStats,
-			err)
-	}
 
 	// The server will return a "BadValue" error if maxTimeMS is greater
 	// than the maximum positive int32 value (about 24.9 days). If the
 	// user specified a timeout value greater than that,  omit maxTimeMS
 	// and let the client-side timeout handle cancelling the op if the
 	// timeout is ever reached.
 	if maxTimeMS > math.MaxInt32 {
-		return 0, nil
+		return 0, false
 	}
 
-	return maxTimeMS, nil
+	return maxTimeMS, true
 }

x/mongo/driver/batch_cursor.go

@@ -391,10 +391,14 @@ func (bc *BatchCursor) getMore(ctx context.Context) {
 				if ctxDeadlineSet {
 					rttMonitor := bc.Server().RTTMonitor()
 
-					var err error
-					maxTimeMS, err = driverutil.CalculateMaxTimeMS(ctx, rttMonitor.Min(), rttMonitor.Stats(), ErrDeadlineWouldBeExceeded)
-					if err != nil {
-						return nil, err
+					var ok bool
+					maxTimeMS, ok = driverutil.CalculateMaxTimeMS(ctx, rttMonitor.Min())
+					if !ok && maxTimeMS <= 0 {
+						return nil, fmt.Errorf(
+							"calculated server-side timeout (%v ms) is less than or equal to 0 (%v): %w",
+							maxTimeMS,
+							rttMonitor.Stats(),
+							ErrDeadlineWouldBeExceeded)
 					}
 				}
 

x/mongo/driver/operation.go

@@ -698,7 +698,7 @@ func (op Operation) Execute(ctx context.Context) error {
 		}
 
 		// Calculate maxTimeMS value to potentially be appended to the wire message.
-		maxTimeMS, err := op.calculateMaxTimeMS(ctx, srvr.RTTMonitor().Min(), srvr.RTTMonitor().Stats())
+		maxTimeMS, err := op.calculateMaxTimeMS(ctx, srvr.RTTMonitor().Min())
 		if err != nil {
 			return err
 		}
@@ -1719,12 +1719,22 @@ func (op Operation) addClusterTime(dst []byte, desc description.SelectedServer)
 // if the ctx is a Timeout context. If the context is not a Timeout context, it uses the
 // operation's MaxTimeMS if set. If no MaxTimeMS is set on the operation, and context is
 // not a Timeout context, calculateMaxTimeMS returns 0.
-func (op Operation) calculateMaxTimeMS(ctx context.Context, rttMin time.Duration, rttStats string) (int64, error) {
+func (op Operation) calculateMaxTimeMS(ctx context.Context, rttMin time.Duration) (int64, error) {
 	if op.OmitMaxTimeMS {
 		return 0, nil
 	}
 
-	return driverutil.CalculateMaxTimeMS(ctx, rttMin, rttStats, ErrDeadlineWouldBeExceeded)
+	// Calculate maxTimeMS value to potentially be appended to the wire message.
+	maxTimeMS, ok := driverutil.CalculateMaxTimeMS(ctx, rttMin)
+	if !ok && maxTimeMS <= 0 {
+		return 0, fmt.Errorf(
+			"calculated server-side timeout (%v ms) is less than or equal to 0 (%v): %w",
+			maxTimeMS,
+			rttMin,
+			ErrDeadlineWouldBeExceeded)
+	}
+
+	return maxTimeMS, nil
 }
 
 // updateClusterTimes updates the cluster times for the session and cluster clock attached to this

x/mongo/driver/operation_test.go

@@ -312,13 +312,14 @@ func TestOperation(t *testing.T) {
 			t.Run(tc.name, func(t *testing.T) {
 				t.Parallel()
 
-				got, err := tc.op.calculateMaxTimeMS(tc.ctx, tc.rttMin, tc.rttStats)
+				got, err := tc.op.calculateMaxTimeMS(tc.ctx, tc.rttMin)
 
 				// Assert that the calculated maxTimeMS is less than or equal to the expected value. A few
 				// milliseconds will have elapsed toward the context deadline, and (remainingTimeout
 				// - rtt90) will be slightly smaller than the expected value.
 				if got > tc.want {
 					t.Errorf("maxTimeMS value higher than expected. got %v; wanted at most %v", got, tc.want)
+					//t.Errorf("calculated server-side timeout (%v ms) is less than or equal to 0 (%v): %w",got, )
 				}
 				if !errors.Is(err, tc.err) {
 					t.Errorf("error values do not match. got %v; want %v", err, tc.err)