Merge pull request #680 from heyitsanthony/client-retry-wakeup-shutdown

Interrupt retry Sleep() on client connection shutdown
This commit is contained in:
Qi Zhao
2016-05-12 17:43:39 -07:00

View File

@ -491,7 +491,10 @@ func (cc *Conn) resetTransport(closeTransport bool) error {
return ErrClientConnTimeout return ErrClientConnTimeout
} }
closeTransport = false closeTransport = false
time.Sleep(sleepTime) select {
case <-time.After(sleepTime):
case <-cc.shutdownChan:
}
retries++ retries++
grpclog.Printf("grpc: Conn.resetTransport failed to create client transport: %v; Reconnecting to %q", err, cc.target) grpclog.Printf("grpc: Conn.resetTransport failed to create client transport: %v; Reconnecting to %q", err, cc.target)
continue continue