Skip to content

Commit

Permalink
GODRIVER-3163 [master] Preserve original cancellation/timeout errors. (
Browse files Browse the repository at this point in the history
…#1627)

Co-authored-by: Felipe Gasper <FGasper@users.noreply.github.com>
  • Loading branch information
blink1073 and FGasper committed May 6, 2024
1 parent 0bb7806 commit 8fd83f7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions x/mongo/driver/topology/connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ func transformNetworkError(ctx context.Context, originalError error, contextDead

// If there was an error and the context was cancelled, we assume it happened due to the cancellation.
if errors.Is(ctx.Err(), context.Canceled) {
return context.Canceled
return ctx.Err()
}

// If there was a timeout error and the context deadline was used, we convert the error into
Expand All @@ -327,7 +327,7 @@ func transformNetworkError(ctx context.Context, originalError error, contextDead
return originalError
}
if netErr, ok := originalError.(net.Error); ok && netErr.Timeout() {
return context.DeadlineExceeded
return fmt.Errorf("%w: %s", context.DeadlineExceeded, originalError.Error())
}

return originalError
Expand Down

0 comments on commit 8fd83f7

Please sign in to comment.