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

chore(standby_server): still sleep for the first time

Browse Source
This commit is contained in:
Yicheng Qin 2014-05-15 23:18:59 -04:00
parent e5ce4fca2e
commit 716496ec42
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/standby_server.go
View File

@ -168,19 +168,17 @@ func (s *StandbyServer) redirectRequests(w http.ResponseWriter, r *http.Request)
uhttp.Redirect(leader.ClientURL, w, r) uhttp.Redirect(leader.ClientURL, w, r)
} }
// monitorCluster assumes that the machine has tried to join the cluster and
// failed, so it waits for the interval at the beginning.
func (s *StandbyServer) monitorCluster() { func (s *StandbyServer) monitorCluster() {
first := true
for { for {
if !first { timer := time.NewTimer(time.Duration(int64(s.syncInterval * float64(time.Second))))
timer := time.NewTimer(time.Duration(int64(s.syncInterval * float64(time.Second)))) defer timer.Stop()
defer timer.Stop() select {
select { case <-s.closeChan:
case <-s.closeChan: return
return case <-timer.C:
case <-timer.C:
}
} }
first = false
if err := s.syncCluster(nil); err != nil { if err := s.syncCluster(nil); err != nil {
log.Warnf("fail syncing cluster(%v): %v", s.Cluster(), err) log.Warnf("fail syncing cluster(%v): %v", s.Cluster(), err)