From 30e0bfe71ef9a09290ca4a8a84b7943564dd67df Mon Sep 17 00:00:00 2001
From: JukLee0ira <meebookmonkey@163.com>
Date: Tue, 24 Jun 2025 15:52:50 +0800
Subject: [PATCH] node: add graceful shutdown timeout for HTTP server #25258
 (#1144)

---
 node/rpcstack.go | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/node/rpcstack.go b/node/rpcstack.go
index 7fb8d653cb..06645f1f35 100644
--- a/node/rpcstack.go
+++ b/node/rpcstack.go
@@ -28,6 +28,7 @@ import (
 	"strings"
 	"sync"
 	"sync/atomic"
+	"time"
 
 	"github.com/XinFinOrg/XDPoSChain/log"
 	"github.com/XinFinOrg/XDPoSChain/rpc"
@@ -88,6 +89,10 @@ type httpServer struct {
 	handlerNames map[string]string
 }
 
+const (
+	shutdownTimeout = 5 * time.Second
+)
+
 func newHTTPServer(log log.Logger, timeouts rpc.HTTPTimeouts) *httpServer {
 	h := &httpServer{log: log, timeouts: timeouts, handlerNames: make(map[string]string)}
 	h.httpHandler.Store((*rpcHandler)(nil))
@@ -270,7 +275,13 @@ func (h *httpServer) doStop() {
 		h.wsHandler.Store((*rpcHandler)(nil))
 		wsHandler.server.Stop()
 	}
-	h.server.Shutdown(context.Background())
+	ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
+	defer cancel()
+	err := h.server.Shutdown(ctx)
+	if err == ctx.Err() {
+		h.log.Warn("HTTP server graceful shutdown timed out")
+		h.server.Close()
+	}
 	h.listener.Close()
 	h.log.Info("HTTP server stopped", "endpoint", h.listener.Addr())