unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 2 Actions 4 Packages Projects Releases 262 Wiki Activity

fix data race for server Wait option (#931)

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
Василий Толстов 2019-11-10 00:52:41 +03:00 committed by Asim Aslam
parent 174b01ca29
commit c696a859be
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/rpc_server.go
View File

@ -112,8 +112,12 @@ func (s *rpcServer) ServeConn(sock transport.Socket) {
wg.Add(1) wg.Add(1)
// add to wait group if "wait" is opt-in // add to wait group if "wait" is opt-in
if s.wg != nil { s.Lock()
s.wg.Add(1) swg := s.wg
s.Unlock()
if swg != nil {
swg.Add(1)
} }
// check we have an existing socket // check we have an existing socket
@ -132,8 +136,8 @@ func (s *rpcServer) ServeConn(sock transport.Socket) {
} }
// done(1) // done(1)
if s.wg != nil { if swg != nil {
s.wg.Done() swg.Done()
} }
wg.Done() wg.Done()
@ -203,8 +207,8 @@ func (s *rpcServer) ServeConn(sock transport.Socket) {
Body: []byte(err.Error()), Body: []byte(err.Error()),
}) })
if s.wg != nil { if swg != nil {
s.wg.Done() swg.Done()
} }
wg.Done() wg.Done()
@ -324,8 +328,8 @@ func (s *rpcServer) ServeConn(sock transport.Socket) {
mtx.Unlock() mtx.Unlock()
// signal we're done // signal we're done
if s.wg != nil { if swg != nil {
s.wg.Done() swg.Done()
} }
// done with this socket // done with this socket
@ -744,9 +748,13 @@ func (s *rpcServer) Start() error {
log.Logf("Server %s-%s deregister error: %s", config.Name, config.Id, err) log.Logf("Server %s-%s deregister error: %s", config.Name, config.Id, err)
} }
s.Lock()
swg := s.wg
s.Unlock()
// wait for requests to finish // wait for requests to finish
if s.wg != nil { if swg != nil {
s.wg.Wait() swg.Wait()
} }
// close transport listener // close transport listener