Skip to content
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

grpc: disable and document overrides of OS default TCP keepalive by Go #6672

Merged
merged 7 commits into from
Nov 7, 2023
Merged

grpc: disable and document overrides of OS default TCP keepalive by Go #6672

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9fe3359
disable client side overrides of OS default TCP keepalive and documen…
JaydenTeoh Oct 1, 2023
3e5bf86
minor changes to documentation
JaydenTeoh Oct 11, 2023
0b94503
Update internal/transport/http2_client.go
JaydenTeoh Oct 19, 2023
3138142
revert changes to greeter server example
JaydenTeoh Oct 19, 2023
5993a5f
document Go version where TCP keepalive defaults was implemented
JaydenTeoh Oct 19, 2023
06962e3
add negative duration fix for tcp proxydial and also fix documentation
JaydenTeoh Oct 27, 2023
50615a5
add punctuation and default OS config to benchmark
JaydenTeoh Nov 7, 2023
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
Prev Previous commit
Next Next commit
add negative duration fix for tcp proxydial and also fix documentation
  • Loading branch information
@JaydenTeoh
JaydenTeoh committed Oct 27, 2023
commit 06962e38f5eb6d017fbd563b0d86ac523d320cbe
2 changes: 1 addition & 1 deletion dialoptions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ func WithTimeout(d time.Duration) DialOption {
// returned by f, gRPC checks the error's Temporary() method to decide if it
// should try to reconnect to the network address.
//
// Note: As of Go 1.13, the standard library overrides the OS defaults for
// Note: As of Go 1.21, the standard library overrides the OS defaults for
// TCP keepalive time and interval to 15s.
// To retain OS defaults, use a net.Dialer with the KeepAlive field set to a
// negative value.
Expand Down
3 changes: 2 additions & 1 deletion internal/transport/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"net/http"
"net/http/httputil"
"net/url"
"time"
)

const proxyAuthHeaderKey = "Proxy-Authorization"
Expand Down Expand Up @@ -122,7 +123,7 @@ func proxyDial(ctx context.Context, addr string, grpcUA string) (conn net.Conn,
newAddr = proxyURL.Host
}

conn, err = (&net.Dialer{}).DialContext(ctx, "tcp", newAddr)
conn, err = (&net.Dialer{KeepAlive: time.Duration(-1)}).DialContext(ctx, "tcp", newAddr)
if err != nil {
return
}
Expand Down
2 changes: 1 addition & 1 deletion server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,7 +814,7 @@ func (l *listenSocket) Close() error {
// this method returns.
// Serve will return a non-nil error unless Stop or GracefulStop is called.
//
// Note: As of Go 1.13, the standard library overrides the OS defaults for
// Note: As of Go 1.21, the standard library overrides the OS defaults for
// TCP keepalive time and interval to 15s.
// To retain OS defaults, pass a net.Listener created by calling the Listen method
// on a net.ListenConfig with the `KeepAlive` field set to a negative value.
Expand Down
Loading