Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4094 from heyitsanthony/send-merged-done-nowait

Browse Source 
etcdserver: respect done channel when sleeping for snapshot backoff
This commit is contained in:
Anthony Romano 2015-12-29 20:18:08 -08:00
commit 8346a7c052
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etcdserver/server.go
View File

@ -933,7 +933,10 @@ func (s *EtcdServer) sendMergedSnap(merged snap.Message) {
// If the follower still fails to catch up, it is probably just too slow // If the follower still fails to catch up, it is probably just too slow
// to catch up. We cannot avoid the snapshot cycle anyway. // to catch up. We cannot avoid the snapshot cycle anyway.
if ok { if ok {
time.Sleep(releaseDelayAfterSnapshot) select {
case <-time.After(releaseDelayAfterSnapshot):
case <-s.done:
}
} }
atomic.AddInt64(&s.inflightSnapshots, -1) atomic.AddInt64(&s.inflightSnapshots, -1)
case <-s.done: case <-s.done: