opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #440 from dkwasnick/patch-1

Browse Source 
Fix cc.Close() state race
This commit is contained in:
Qi Zhao
2015-11-18 10:54:05 -08:00
parent 7c736b2fc9 0fd544f256
commit e749af2b92
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
clientconn.go
View File

@ -359,6 +359,7 @@ func (cc *Conn) resetTransport(closeTransport bool) error {
cc.mu.Lock()
cc.printf("connecting")
if cc.state == Shutdown {
// cc.Close() has been invoked.
cc.mu.Unlock()
return ErrClientConnClosing
}
@ -393,6 +394,11 @@ func (cc *Conn) resetTransport(closeTransport bool) error {
newTransport, err := transport.NewClientTransport(cc.target, &copts)
if err != nil {
cc.mu.Lock()
if cc.state == Shutdown {
// cc.Close() has been invoked.
cc.mu.Unlock()
return ErrClientConnClosing
}
cc.errorf("transient failure: %v", err)
cc.state = TransientFailure
cc.stateCV.Broadcast()
@ -450,6 +456,11 @@ func (cc *Conn) transportMonitor() {
return
case <-cc.transport.Error():
cc.mu.Lock()
if cc.state == Shutdown {
// cc.Close() has been invoked.
cc.mu.Unlock()
return
}
cc.state = TransientFailure
cc.stateCV.Broadcast()
cc.mu.Unlock()