Merge pull request #5168 from heyitsanthony/fix-pipeline-leak

etcdserver: stop raft after stopping apply scheduler
release-3.0
Anthony Romano 2016-04-22 19:11:34 -07:00
commit 50471d0c5c
1 changed files with 4 additions and 1 deletions

View File

@ -537,9 +537,12 @@ func (s *EtcdServer) run() {
}
defer func() {
s.r.stop()
sched.Stop()
// must stop raft after scheduler-- etcdserver can leak rafthttp pipelines
// by adding a peer after raft stops the transport
s.r.stop()
s.wg.Wait()
// kv, lessor and backend can be nil if running without v3 enabled