Skip to content

GODRIVER-3163 Preserve original cancellation/timeout errors. #1625

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 1, 2024
Merged

GODRIVER-3163 Preserve original cancellation/timeout errors. #1625

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7bdf99
GODRIVER-3163: Preserve original cancellation/timeout errors.
FGasper Apr 29, 2024
b341d46
Merge branch 'v1' into GODRIVER-3163-preserve-canceled-wrapper
FGasper Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions x/mongo/driver/topology/connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,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 @@ -329,7 +329,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