From f6591b95c75ab050290c4cc8fb35decc14cb3a82 Mon Sep 17 00:00:00 2001
From: Yicheng Qin <qycqycqycqycqyc@gmail.com>
Date: Tue, 13 May 2014 22:16:45 -0400
Subject: [PATCH] chore(standby): minor changes based on comments

---
 Documentation/design/standbys.md |  2 +-
 etcd/etcd.go                     |  4 ++--
 server/standby_server.go         | 10 ++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Documentation/design/standbys.md b/Documentation/design/standbys.md
index 7ea9bbd8c..a771183c1 100644
--- a/Documentation/design/standbys.md
+++ b/Documentation/design/standbys.md
@@ -14,7 +14,7 @@ Standbys also act as standby nodes in the event that a peer node in the cluster
 There are three configuration parameters used by standbys: active size, remove delay and standby sync interval.
 
 The active size specifies a target size for the number of peers in the cluster.
-If there are not enough peers to meet the active size then, standbys will send join requests until the peer count is equal to the active size.
+If there are not enough peers to meet the active size, standbys will send join requests until the peer count is equal to the active size.
 If there are more peers than the target active size then peers are removed by the leader and will become standbys.
 
 The remove delay specifies how long the cluster should wait before removing a dead peer.
diff --git a/etcd/etcd.go b/etcd/etcd.go
index 77177454a..b493f3f47 100644
--- a/etcd/etcd.go
+++ b/etcd/etcd.go
@@ -293,7 +293,7 @@ func (e *Etcd) runServer() {
 	var removeNotify <-chan bool
 	for {
 		if e.mode == PeerMode {
-			log.Infof("%v starts to run in peer mode", e.Config.Name)
+			log.Infof("%v starting in peer mode", e.Config.Name)
 			// Starting peer server should be followed close by listening on its port
 			// If not, it may leave many requests unaccepted, or cannot receive heartbeat from the cluster.
 			// One severe problem caused if failing receiving heartbeats is when the second node joins one-node cluster,
@@ -301,7 +301,7 @@ func (e *Etcd) runServer() {
 			e.PeerServer.Start(e.Config.Snapshot, e.Config.ClusterConfig())
 			removeNotify = e.PeerServer.RemoveNotify()
 		} else {
-			log.Infof("%v starts to run in standby mode", e.Config.Name)
+			log.Infof("%v starting in standby mode", e.Config.Name)
 			e.StandbyServer.Start()
 			removeNotify = e.StandbyServer.RemoveNotify()
 		}
diff --git a/server/standby_server.go b/server/standby_server.go
index 817030e45..b0f093108 100644
--- a/server/standby_server.go
+++ b/server/standby_server.go
@@ -15,8 +15,6 @@ import (
 	"github.com/coreos/etcd/store"
 )
 
-const UninitedSyncInterval = time.Duration(5) * time.Second
-
 type StandbyServerConfig struct {
 	Name       string
 	PeerScheme string
@@ -44,7 +42,7 @@ func NewStandbyServer(config StandbyServerConfig, client *Client) *StandbyServer
 	return &StandbyServer{
 		Config:       config,
 		client:       client,
-		syncInterval: UninitedSyncInterval,
+		syncInterval: time.Duration(int64(DefaultSyncInterval * float64(time.Second))),
 	}
 }
 
@@ -209,7 +207,7 @@ func (s *StandbyServer) join(peer string) error {
 	// Our version must match the leaders version
 	version, err := s.client.GetVersion(peer)
 	if err != nil {
-		log.Debugf("fail checking join version")
+		log.Debugf("error getting peer version")
 		return err
 	}
 	if version < store.MinVersion() || version > store.MaxVersion() {
@@ -220,7 +218,7 @@ func (s *StandbyServer) join(peer string) error {
 	// Fetch cluster config to see whether exists some place.
 	clusterConfig, err := s.client.GetClusterConfig(peer)
 	if err != nil {
-		log.Debugf("fail getting cluster config")
+		log.Debugf("error getting cluster config")
 		return err
 	}
 	if clusterConfig.ActiveSize <= len(s.Cluster()) {
@@ -237,7 +235,7 @@ func (s *StandbyServer) join(peer string) error {
 			EtcdURL:    s.Config.ClientURL,
 		})
 	if err != nil {
-		log.Debugf("fail on join request")
+		log.Debugf("error on join request")
 		return err
 	}
 	s.joinIndex = commitIndex