fix: server data race issue (#1644)

cloudwego · Dec 19, 2024 · e15b7a1 · e15b7a1
1 parent 85e3c72
commit e15b7a1
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/server/server.go b/server/server.go
@@ -250,12 +250,13 @@ func (s *server) Run() (err error) {
 	if err != nil {
 		return err
 	}
-	s.Lock()
-	s.svr, err = remotesvr.NewServer(s.opt.RemoteOpt, transHdlr)
-	s.Unlock()
+	svr, err := remotesvr.NewServer(s.opt.RemoteOpt, transHdlr)
 	if err != nil {
 		return err
 	}
+	s.Lock()
+	s.svr = svr
+	s.Unlock()
 
 	// start profiler
 	if s.opt.RemoteOpt.Profiler != nil {
@@ -268,7 +269,7 @@ func (s *server) Run() (err error) {
 		})
 	}
 
-	errCh := s.svr.Start()
+	errCh := svr.Start()
 	select {
 	case err = <-errCh:
 		klog.Errorf("KITEX: server start error: error=%s", err.Error())
@@ -281,7 +282,7 @@ func (s *server) Run() (err error) {
 	}
 	muStartHooks.Unlock()
 	s.Lock()
-	s.buildRegistryInfo(s.svr.Address())
+	s.buildRegistryInfo(svr.Address())
 	s.Unlock()
 
 	if err = s.waitExit(errCh); err != nil {