database/tidb
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

server: use Atomic.Pointer in the Server.statusServer (#62903)

Browse Source 
close pingcap/tidb#62902
This commit is contained in:
Weizhen Wang
2025-08-08 19:05:00 +08:00
committed by GitHub
parent 857a162ea4
commit 5c7794c2e2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/server/http_status.go
View File

@ -586,7 +586,7 @@ func (s *Server) startStatusServerAndRPCServer(serverMux *http.ServeMux) {
}
}
s.statusServer = statusServer
s.statusServer.Store(statusServer)
s.grpcServer = grpcServer
go util.WithRecovery(func() {

8
pkg/server/server.go
View File

@ -142,7 +142,7 @@ type Server struct {
statusAddr string
statusListener net.Listener
statusServer *http.Server
statusServer atomic.Pointer[http.Server]
grpcServer *grpc.Server
inShutdownMode *uatomic.Bool
health *uatomic.Bool
@ -643,10 +643,10 @@ func (s *Server) closeListener() {
terror.Log(errors.Trace(err))
s.socket = nil
}
if s.statusServer != nil {
err := s.statusServer.Close()
if statusServer := s.statusServer.Load(); statusServer != nil {
err := statusServer.Close()
terror.Log(errors.Trace(err))
s.statusServer = nil
s.statusServer.Store(nil)
}
if s.grpcServer != nil {
s.grpcServer.Stop()