Skip to content

Improve readability of timeout error normalization #2474

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

Closed
skarm wants to merge 2 commits into from
Closed

Improve readability of timeout error normalization #2474

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e48d622
improve readability of timeout error normalization
skarm Jan 10, 2026
6d4cf42
Merge branch 'jackc:master' into master
skarm Jan 18, 2026
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
24 changes: 14 additions & 10 deletions pgconn/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,17 +137,21 @@ func (e *ParseConfigError) Unwrap() error {

func normalizeTimeoutError(ctx context.Context, err error) error {
var netErr net.Error
if errors.As(err, &netErr) && netErr.Timeout() {
if ctx.Err() == context.Canceled {
// Since the timeout was caused by a context cancellation, the actual error is context.Canceled not the timeout error.
return context.Canceled
} else if ctx.Err() == context.DeadlineExceeded {
return &errTimeout{err: ctx.Err()}
} else {
return &errTimeout{err: netErr}
}
if !errors.As(err, &netErr) || !netErr.Timeout() {
return err
}

ctxErr := ctx.Err()
if ctxErr == nil {
return &errTimeout{err: netErr}
}
return err

if errors.Is(ctxErr, context.Canceled) {
// Since the timeout was caused by a context cancellation, the actual error is context.Canceled not the timeout error.
return context.Canceled
}

return &errTimeout{err: ctxErr}
}

type pgconnError struct {
Expand Down