Merge pull request #7814 from gyuho/aaa

etcdserver: do not block on raft stopping
This commit is contained in:
Gyu-Ho Lee 2017-04-25 15:00:06 -07:00 committed by GitHub
commit 96aaeee4f5

View File

@ -260,7 +260,11 @@ func (r *raftNode) start(rh *raftReadyHandler) {
// blocks until 'applyAll' calls 'applyWait.Trigger'
// to be in sync with scheduled config-change job
// (assume raftDone has cap of 1)
raftDone <- struct{}{}
select {
case raftDone <- struct{}{}:
case <-r.stopped:
return
}
}
// gofail: var raftBeforeFollowerSend struct{}