go/go-micro
1
0
Fork 0
mirror of https://github.com/go-micro/go-micro.git synced 2024-11-24 08:02:32 +02:00
Code Issues Releases 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:
Vasiliy Tolstov 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)
// add to wait group if "wait" is opt-in
if s.wg != nil {
s.wg.Add(1)
s.Lock()
swg := s.wg
s.Unlock()
if swg != nil {
swg.Add(1)
}
// check we have an existing socket
@ -132,8 +136,8 @@ func (s *rpcServer) ServeConn(sock transport.Socket) {
}
// done(1)
if s.wg != nil {
s.wg.Done()
if swg != nil {
swg.Done()
}
wg.Done()
@ -203,8 +207,8 @@ func (s *rpcServer) ServeConn(sock transport.Socket) {
Body: []byte(err.Error()),
})
if s.wg != nil {
s.wg.Done()
if swg != nil {
swg.Done()
}
wg.Done()
@ -324,8 +328,8 @@ func (s *rpcServer) ServeConn(sock transport.Socket) {
mtx.Unlock()
// signal we're done
if s.wg != nil {
s.wg.Done()
if swg != nil {
swg.Done()
}
// 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)
}
s.Lock()
swg := s.wg
s.Unlock()
// wait for requests to finish
if s.wg != nil {
s.wg.Wait()
if swg != nil {
swg.Wait()
}
// close transport listener