-
- Downloads
os, net: define and use os.ErrDeadlineExceeded
If an I/O operation fails because a deadline was exceeded, return os.ErrDeadlineExceeded. We used to return poll.ErrTimeout, an internal error, and told users to check the Timeout method. However, there are other errors with a Timeout method that returns true, notably syscall.ETIMEDOUT which is returned for a keep-alive timeout. Checking errors.Is(err, os.ErrDeadlineExceeded) should permit code to reliably tell why it failed. This change does not affect the handling of net.Dialer.Deadline, nor does it change the handling of net.DialContext when the context deadline is exceeded. Those cases continue to return an error reported as "i/o timeout" for which Timeout is true, but that error is not os.ErrDeadlineExceeded. Fixes #31449 Change-Id: I0323f42e944324c6f2578f00c3ac90c24fe81177 Reviewed-on: https://go-review.googlesource.com/c/go/+/228645 Run-TryBot: Ian Lance Taylor <iant@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by:Filippo Valsorda <filippo@golang.org>
Showing
- doc/go1.15.html 38 additions, 0 deletionsdoc/go1.15.html
- src/internal/poll/fd.go 11 additions, 7 deletionssrc/internal/poll/fd.go
- src/internal/poll/fd_plan9.go 4 additions, 4 deletionssrc/internal/poll/fd_plan9.go
- src/internal/poll/fd_poll_js.go 1 addition, 1 deletionsrc/internal/poll/fd_poll_js.go
- src/internal/poll/fd_poll_runtime.go 1 addition, 1 deletionsrc/internal/poll/fd_poll_runtime.go
- src/internal/poll/fd_windows.go 1 addition, 1 deletionsrc/internal/poll/fd_windows.go
- src/net/dial.go 1 addition, 2 deletionssrc/net/dial.go
- src/net/dial_test.go 2 additions, 3 deletionssrc/net/dial_test.go
- src/net/dnsclient_unix_test.go 7 additions, 8 deletionssrc/net/dnsclient_unix_test.go
- src/net/error_test.go 5 additions, 5 deletionssrc/net/error_test.go
- src/net/net.go 27 additions, 14 deletionssrc/net/net.go
- src/net/pipe.go 5 additions, 10 deletionssrc/net/pipe.go
- src/net/rawconn_test.go 4 additions, 4 deletionssrc/net/rawconn_test.go
- src/net/timeout_test.go 38 additions, 20 deletionssrc/net/timeout_test.go
- src/net/unixsock_test.go 2 additions, 2 deletionssrc/net/unixsock_test.go
- src/os/error.go 15 additions, 5 deletionssrc/os/error.go
- src/os/file.go 6 additions, 4 deletionssrc/os/file.go
- src/os/os_test.go 12 additions, 0 deletionssrc/os/os_test.go
- src/os/os_unix_test.go 1 addition, 1 deletionsrc/os/os_unix_test.go
- src/os/timeout_test.go 15 additions, 16 deletionssrc/os/timeout_test.go
Loading
Please register or sign in to comment