Add proxy server timeout config options (#420)

superfly · Nov 16, 2023 · d861e91 · d861e91
1 parent e769043
commit d861e91
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 0 deletions.
diff --git a/cmd/litefs/config.go b/cmd/litefs/config.go
@@ -67,6 +67,10 @@ func NewConfig() Config {
 
 	config.Proxy.MaxLag = http.DefaultMaxLag
 	config.Proxy.PrimaryRedirectTimeout = http.DefaultPrimaryRedirectTimeout
+	config.Proxy.ReadTimeout = http.DefaultReadTimeout
+	config.Proxy.ReadHeaderTimeout = http.DefaultReadHeaderTimeout
+	config.Proxy.WriteTimeout = http.DefaultWriteTimeout
+	config.Proxy.IdleTimeout = http.DefaultIdleTimeout
 
 	config.Tracing.Enabled = true
 	config.Tracing.MaxSize = DefaultTracingMaxSize
@@ -130,6 +134,11 @@ type ProxyConfig struct {
 	Passthrough            []string      `yaml:"passthrough"`
 	AlwaysForward          []string      `yaml:"always-forward"`
 	PrimaryRedirectTimeout time.Duration `yaml:"primary-redirect-timeout"`
+
+	ReadTimeout       time.Duration `yaml:"read-timeout"`
+	ReadHeaderTimeout time.Duration `yaml:"read-header-timeout"`
+	WriteTimeout      time.Duration `yaml:"write-timeout"`
+	IdleTimeout       time.Duration `yaml:"idle-timeout"`
 }
 
 // LeaseConfig represents a generic configuration for all lease types.

diff --git a/cmd/litefs/mount_linux.go b/cmd/litefs/mount_linux.go
@@ -541,6 +541,11 @@ func (c *MountCommand) runProxyServer(ctx context.Context) error {
 	server.Passthroughs = passthroughs
 	server.AlwaysForward = alwaysForward
 	server.PrimaryRedirectTimeout = c.Config.Proxy.PrimaryRedirectTimeout
+	server.ReadTimeout = c.Config.Proxy.ReadTimeout
+	server.ReadHeaderTimeout = c.Config.Proxy.ReadHeaderTimeout
+	server.WriteTimeout = c.Config.Proxy.WriteTimeout
+	server.IdleTimeout = c.Config.Proxy.IdleTimeout
+
 	if err := server.Listen(); err != nil {
 		return err
 	}

diff --git a/http/proxy_server.go b/http/proxy_server.go
@@ -29,6 +29,11 @@ const (
 	DefaultMaxLag = 10 * time.Second
 
 	DefaultCookieExpiry = 5 * time.Minute
+
+	DefaultReadTimeout       = 0
+	DefaultReadHeaderTimeout = 10 * time.Second
+	DefaultWriteTimeout      = 0
+	DefaultIdleTimeout       = 30 * time.Second
 )
 
 var ErrProxyServerClosed = fmt.Errorf("canceled, proxy server closed")
@@ -76,6 +81,12 @@ type ProxyServer struct {
 	// Time before cookie expires on client.
 	CookieExpiry time.Duration
 
+	// HTTP server timeouts
+	ReadTimeout       time.Duration
+	ReadHeaderTimeout time.Duration
+	WriteTimeout      time.Duration
+	IdleTimeout       time.Duration
+
 	HTTPTransport *http.Transport
 }
 
@@ -89,6 +100,10 @@ func NewProxyServer(store *litefs.Store) *ProxyServer {
 		MaxLag:                 DefaultMaxLag,
 		CookieExpiry:           DefaultCookieExpiry,
 		PrimaryRedirectTimeout: DefaultPrimaryRedirectTimeout,
+		ReadTimeout:            DefaultReadTimeout,
+		ReadHeaderTimeout:      DefaultReadHeaderTimeout,
+		WriteTimeout:           DefaultWriteTimeout,
+		IdleTimeout:            DefaultIdleTimeout,
 	}
 
 	s.ctx, s.cancel = context.WithCancelCause(context.Background())
@@ -129,6 +144,11 @@ func (s *ProxyServer) Listen() (err error) {
 }
 
 func (s *ProxyServer) Serve() {
+	s.httpServer.ReadTimeout = s.ReadTimeout
+	s.httpServer.ReadHeaderTimeout = s.ReadHeaderTimeout
+	s.httpServer.WriteTimeout = s.WriteTimeout
+	s.httpServer.IdleTimeout = s.IdleTimeout
+
 	s.g.Go(func() error {
 		if err := s.httpServer.Serve(s.ln); s.ctx.Err() != nil {
 			return err