GODRIVER-3853 Update erroring logic.

Author: qingyang-hu

internal/integration/unified/session_operation_execution.go

@@ -109,6 +109,7 @@ func executeWithTransaction(ctx context.Context, op *operation, loopDone <-chan
 		for idx, oper := range operations {
 			res, execErr := oper.execute(ctx, loopDone)
 			if execErr != nil {
+				// Capture the error but continue executing the remaining operations in the callback.
 				err = fmt.Errorf("error executing operation %q at index %d: %v", oper.Name, idx, execErr)
 				return nil, nil
 			}

mongo/errors.go

@@ -834,10 +834,11 @@ type TimeoutError struct {
 
 // Error implements the error interface.
 func (e TimeoutError) Error() string {
+	const timeoutMsg = "operation timed out"
 	if e.Wrapped == nil {
-		return "operation timed out"
+		return timeoutMsg
 	}
-	return e.Wrapped.Error()
+	return fmt.Sprintf("%s: %v", timeoutMsg, e.Wrapped.Error())
 }
 
 // Unwrap returns the underlying error.

mongo/session.go

@@ -217,15 +217,14 @@ func (s *Session) WithTransaction(
 				return res, nil
 			}
 
-			select {
-			case <-timeout.C:
-				return res, TimeoutError{Wrapped: err}
-			default:
-			}
-
 			var cerr CommandError
 			if errors.As(err, &cerr) {
 				if cerr.HasErrorLabel(driver.UnknownTransactionCommitResult) && !cerr.IsMaxTimeMSExpiredError() {
+					select {
+					case <-timeout.C:
+						return res, TimeoutError{Wrapped: err}
+					default:
+					}
 					continue
 				}
 				if cerr.HasErrorLabel(driver.TransientTransactionError) {