SeaweedFS is a distributed storage system for object storage (S3), file systems, Iceberg table buckets, and Lance vector buckets, designed to handle billions of files with O(1) disk access and effortless horizontal scaling.
Go blob-storagecloud-drivedistributed-file-systemdistributed-storageerasure-codingfusehadoop-hdfshdfskuberneteslancelancedbobject-storageposixs3s3-storageseaweedfstiered-file-systemvector-search
util: don't let the activity timeout clobber externally-set conn deadlines (#10212)
Chris Lu39961ce5d7d9
diff --git a/weed/util/net_timeout.go b/weed/util/net_timeout.goindex 9aeb5cd480..c691657fe5 100644--- a/weed/util/net_timeout.go+++ b/weed/util/net_timeout.go@@ -2,6 +2,7 @@ package utilimport ("net"+ "sync""time""github.com/seaweedfs/seaweedfs/weed/glog"@@ -32,18 +33,75 @@ func (l *Listener) Accept() (net.Conn, error) {// Conn wraps a net.Conn and implements a "no activity timeout".// Any activity (read or write) resets the deadline, so the connection// only times out when there's no activity in either direction.+//+// Callers may also set deadlines directly — net/http's server does this+// to interrupt a blocked read (abortPendingRead sets a deadline in the+// past) and to enforce its own Read/Write timeouts. The activity+// extension must never overwrite such an externally-set deadline, or the+// interrupt is lost and the read stays blocked until the activity+// timeout fires (wedging connection drain on shutdown for up to the full+// idle timeout). mu serializes deadline updates, and while an external+// deadline is in force on a direction the activity extension for that+// direction is suspended; it resumes once the caller clears the deadline+// (sets the zero time).type Conn struct {net.ConnTimeout time.DurationisClosed bool++ mu sync.Mutex+ externalReadDeadline bool+ externalWriteDeadline bool+}++func (c *Conn) SetDeadline(t time.Time) error {+ c.mu.Lock()+ defer c.mu.Unlock()+ c.externalReadDeadline = !t.IsZero()+ c.externalWriteDeadline = !t.IsZero()+ return c.Conn.SetDeadline(t)+}++func (c *Conn) SetReadDeadline(t time.Time) error {+ c.mu.Lock()+ defer c.mu.Unlock()+ c.externalReadDeadline = !t.IsZero()+ return c.Conn.SetReadDeadline(t)+}++func (c *Conn) SetWriteDeadline(t time.Time) error {+ c.mu.Lock()+ defer c.mu.Unlock()+ c.externalWriteDeadline = !t.IsZero()+ return c.Conn.SetWriteDeadline(t)}// extendDeadline extends the connection deadline from now.-// This implements "no activity timeout" - any activity keeps the connection alive.+// This implements "no activity timeout" - any activity keeps the+// connection alive in both directions (a long write-only response must+// keep the read deadline alive too, or net/http's background read would+// time out and cancel the in-flight request). Each direction is extended+// independently: an externally-managed deadline on one side (e.g. a+// server WriteTimeout) must not leave the other side's deadline stale.func (c *Conn) extendDeadline() error {- if c.Timeout > 0 {+ c.mu.Lock()+ defer c.mu.Unlock()+ if c.Timeout <= 0 {+ return nil+ }+ if !c.externalReadDeadline && !c.externalWriteDeadline {return c.Conn.SetDeadline(time.Now().Add(c.Timeout))}+ if !c.externalReadDeadline {+ if err := c.Conn.SetReadDeadline(time.Now().Add(c.Timeout)); err != nil {+ return err+ }+ }+ if !c.externalWriteDeadline {+ if err := c.Conn.SetWriteDeadline(time.Now().Add(c.Timeout)); err != nil {+ return err+ }+ }return nil}