etcd: standby does not need to send join

etcd/etcd.go

@@ -150,7 +150,7 @@ func (s *Server) Run() {
 			s.mu.Unlock()
 			next = s.p.run()
 		case standbyMode:
-			s.s = newStandby(s.id, s.pubAddr, s.raftPubAddr, s.client, s.peerHub)
+			s.s = newStandby(s.client, s.peerHub)
 			s.mode.Set(standbyMode)
 			s.mu.Unlock()
 			next = s.s.run()

etcd/standby.go

@@ -25,7 +25,6 @@ import (
 	"time"
 
 	"github.com/coreos/etcd/config"
-	"github.com/coreos/etcd/store"
 )
 
 var (
@@ -33,10 +32,6 @@ var (
 )
 
 type standby struct {
-	id          int64
-	pubAddr     string
-	raftPubAddr string
-
 	client  *v2client
 	peerHub *peerHub
 
@@ -50,12 +45,8 @@ type standby struct {
 	*http.ServeMux
 }
 
-func newStandby(id int64, pubAddr string, raftPubAddr string, client *v2client, peerHub *peerHub) *standby {
+func newStandby(client *v2client, peerHub *peerHub) *standby {
 	s := &standby{
-		id:          id,
-		pubAddr:     pubAddr,
-		raftPubAddr: raftPubAddr,
-
 		client:  client,
 		peerHub: peerHub,
 
@@ -78,7 +69,7 @@ func (s *standby) run() int64 {
 		select {
 		case <-time.After(syncDuration):
 		case <-s.stopc:
-			log.Printf("Standby %d stopped\n", s.id)
+			log.Printf("Standby stopped\n")
 			return stopMode
 		}
 
@@ -92,10 +83,6 @@ func (s *standby) run() int64 {
 		if s.clusterConf.ActiveSize <= len(nodes) {
 			continue
 		}
-		if err := s.joinByAddr(s.leaderAddr); err != nil {
-			log.Println("standby join:", err)
-			continue
-		}
 		return participantMode
 	}
 }
@@ -155,16 +142,3 @@ func (s *standby) syncCluster(nodes map[string]bool) (map[string]bool, error) {
 	}
 	return nil, fmt.Errorf("unreachable cluster")
 }
-
-func (s *standby) joinByAddr(addr string) error {
-	info := &context{
-		MinVersion: store.MinVersion(),
-		MaxVersion: store.MaxVersion(),
-		ClientURL:  s.pubAddr,
-		PeerURL:    s.raftPubAddr,
-	}
-	if err := s.client.AddMachine(s.leaderAddr, fmt.Sprint(s.id), info); err != nil {
-		return err
-	}
-	return nil
-}