Merge pull request #4283 from heyitsanthony/fix-stopdelay-leak

etcdserver: complete stopWithDelay on server shutdown
This commit is contained in:
Anthony Romano 2016-01-25 20:11:55 -08:00
commit 2a9cccd659

View File

@ -704,7 +704,10 @@ func (s *EtcdServer) Stop() {
} }
func (s *EtcdServer) stopWithDelay(d time.Duration, err error) { func (s *EtcdServer) stopWithDelay(d time.Duration, err error) {
time.Sleep(d) select {
case <-time.After(d):
case <-s.done:
}
select { select {
case s.errorc <- err: case s.errorc <- err:
default: default: