GODRIVER-3444 Resovle merge conflicts

Author: prestonvasquez

internal/driverutil/operation.go

@@ -8,7 +8,6 @@ package driverutil
 
 import (
 	"context"
-	"fmt"
 	"math"
 	"time"
 )
@@ -38,10 +37,14 @@ 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) {
+// CalculateMaxTimeMS calculates the maxTimeMS value to send to the server
+// based on the context deadline and the minimum round trip time. If the
+// calculated maxTimeMS is likely to cause a socket timeout, then this function
+// will return 0 and false.
+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)
@@ -50,12 +53,7 @@ func CalculateMaxTimeMS(ctx context.Context, rttMin time.Duration, rttStats stri
 	// 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)
+		return 0, false
 	}
 
 	// The server will return a "BadValue" error if maxTimeMS is greater
@@ -64,8 +62,8 @@ func CalculateMaxTimeMS(ctx context.Context, rttMin time.Duration, rttStats stri
 	// 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, true
 	}
 
-	return maxTimeMS, nil
+	return maxTimeMS, true
 }

internal/integration/unified/cursor_operation_execution.go

@@ -30,7 +30,6 @@ func executeIterateOnce(ctx context.Context, operation *operation) (*operationRe
 
 		return newDocumentResult(res, nil), nil
 	}
-
 	return newErrorResult(cursor.Err()), nil
 }
 

internal/spectest/skip.go

@@ -346,6 +346,10 @@ var skipTests = map[string][]string{
 		"TestUnifiedSpec/client-side-operations-timeout/tests/retryability-timeoutMS.json/operation_is_retried_multiple_times_for_non-zero_timeoutMS_-_aggregate_on_collection",
 		"TestUnifiedSpec/client-side-operations-timeout/tests/retryability-timeoutMS.json/operation_is_retried_multiple_times_for_non-zero_timeoutMS_-_aggregate_on_database",
 		"TestUnifiedSpec/client-side-operations-timeout/tests/gridfs-find.json/timeoutMS_applied_to_find_command",
+		"TestUnifiedSpec/client-side-operations-timeout/tests/tailable-awaitData.json/timeoutMS_applied_to_find",
+		"TestUnifiedSpec/client-side-operations-timeout/tests/tailable-awaitData.json/timeoutMS_is_refreshed_for_getMore_if_maxAwaitTimeMS_is_not_set",
+		"TestUnifiedSpec/client-side-operations-timeout/tests/tailable-awaitData.json/timeoutMS_is_refreshed_for_getMore_if_maxAwaitTimeMS_is_set",
+		"TestUnifiedSpec/client-side-operations-timeout/tests/tailable-awaitData.json/timeoutMS_is_refreshed_for_getMore_-_failure",
 	},
 
 	// TODO(GODRIVER-3411): Tests require "getMore" with "maxTimeMS" settings. Not
@@ -819,6 +823,21 @@ var skipTests = map[string][]string{
 		"TestUnifiedSpec/transactions-convenient-api/tests/unified/transaction-options.json/withTransaction_explicit_transaction_options_override_client_options",
 		"TestUnifiedSpec/transactions-convenient-api/tests/unified/commit.json/withTransaction_commits_after_callback_returns",
 	},
+
+	// GODRIVER-3473: the implementation of DRIVERS-2868 makes it clear that the
+	// Go Driver does not correctly implement the following validation for
+	// tailable awaitData cursors:
+	//
+	//     Drivers MUST error if this option is set, timeoutMS is set to a
+	//     non-zero value, and maxAwaitTimeMS is greater than or equal to
+	//     timeoutMS.
+	//
+	// Once GODRIVER-3473 is completed, we can continue running these tests.
+	"When constructing tailable awaitData cusors must validate, timeoutMS is set to a non-zero value, and maxAwaitTimeMS is greater than or equal to timeoutMS (GODRIVER-3473)": {
+		"TestUnifiedSpec/client-side-operations-timeout/tailable-awaitData.json/apply_remaining_timeoutMS_if_less_than_maxAwaitTimeMS",
+		"TestUnifiedSpec/client-side-operations-timeout/tailable-awaitData.json/error_if_maxAwaitTimeMS_is_equal_to_timeoutMS",
+		"TestUnifiedSpec/client-side-operations-timeout/tailable-awaitData.json/error_if_maxAwaitTimeMS_is_greater_than_timeoutMS",
+	},
 }
 
 // CheckSkip checks if the fully-qualified test name matches a list of skipped test names for a given reason.

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

@@ -1724,7 +1724,17 @@ func (op Operation) calculateMaxTimeMS(ctx context.Context, rttMin time.Duration
 		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,
+			rttStats,
+			ErrDeadlineWouldBeExceeded)
+	}
+
+	return maxTimeMS, nil
 }
 
 // updateClusterTimes updates the cluster times for the session and cluster clock attached to this