Skip to content

Set self-adjusting deadline for connection writing #16068

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 11 commits into from
Jun 10, 2021
Merged

Set self-adjusting deadline for connection writing #16068

Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
da16cab
Set self-adjusting deadline for connection writing
zeripath Jun 4, 2021
139c46f
take account of large writes in both steps
zeripath Jun 4, 2021
e32cd40
Update modules/graceful/server.go
zeripath Jun 4, 2021
901e217
Update modules/graceful/server.go
zeripath Jun 4, 2021
8fe1eb0
Adjust timeouts
zeripath Jun 5, 2021
c4ffb55
Linearly increase timeout
zeripath Jun 5, 2021
ffcf471
Update server.go
zeripath Jun 5, 2021
7a49625
Make PerWriteTimeout, PerWritePerKbTimeouts configurable
zeripath Jun 5, 2021
32c1192
Merge branch 'main' into per-write-timeout-adjusting
6543 Jun 10, 2021
159e256
Merge branch 'main' into per-write-timeout-adjusting
6543 Jun 10, 2021
63336a4
Merge branch 'main' into per-write-timeout-adjusting
6543 Jun 10, 2021
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
21 changes: 18 additions & 3 deletions modules/graceful/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ var (
// PerWriteWriteTimeout timeout for writes
const PerWriteWriteTimeout = 5 * time.Second

// PerWriteWriteTimeoutKbRate is a timeout taking account of how much there is to be written
const PerWriteWriteTimeoutKbRate = 2 * time.Second

func init() {
DefaultMaxHeaderBytes = 0 // use http.DefaultMaxHeaderBytes - which currently is 1 << 20 (1MB)
}
Expand Down Expand Up @@ -249,13 +252,25 @@ func (wl *wrappedListener) File() (*os.File, error) {

type wrappedConn struct {
net.Conn
server *Server
closed *int32
server *Server
closed *int32
deadline time.Time
}

func (w wrappedConn) Write(p []byte) (n int, err error) {
if PerWriteWriteTimeout > 0 {
_ = w.Conn.SetWriteDeadline(time.Now().Add(PerWriteWriteTimeout))
minTimeout := PerWriteWriteTimeout/2 + time.Duration(len(p)/1024)*PerWriteWriteTimeoutKbRate
minDeadline := time.Now().Add(minTimeout)

if minTimeout < PerWriteWriteTimeout {
minDeadline = time.Now().Add(PerWriteWriteTimeout)
}

w.deadline = w.deadline.Add(minTimeout)
if minDeadline.After(w.deadline) {
w.deadline = minDeadline
}
_ = w.Conn.SetWriteDeadline(w.deadline)
}
return w.Conn.Write(p)
}
Expand Down