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

etcd: remove unncessary code in participant

Browse Source
This commit is contained in:
Xiang Li 2014-07-18 13:49:51 -07:00 committed by Yicheng Qin
parent 2e59635bea
commit 9ffc0b9f2c
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etcd/participant.go
View File

@ -5,7 +5,6 @@ import (
"fmt"
"log"
"net/http"
"net/url"
"path"
"sync"
"time"
@ -279,9 +278,7 @@ func (p *participant) apply(ents []raft.Entry) {
peer.participate()
log.Printf("Add Node %x %v %v\n", cfg.NodeId, cfg.Addr, string(cfg.Context))
pp := path.Join(v2machineKVPrefix, fmt.Sprint(cfg.NodeId))
if _, err := p.Store.Set(pp, false, fmt.Sprintf("raft=%v&etcd=%v", cfg.Addr, string(cfg.Context)), store.Permanent); err == nil {
p.seeds[cfg.Addr] = true
}
p.Store.Set(pp, false, fmt.Sprintf("raft=%v&etcd=%v", cfg.Addr, string(cfg.Context)), store.Permanent)
case raft.RemoveNode:
cfg := new(raft.Config)
if err := json.Unmarshal(ent.Data, cfg); err != nil {
@ -289,7 +286,6 @@ func (p *participant) apply(ents []raft.Entry) {
break
}
log.Printf("Remove Node %x\n", cfg.NodeId)
delete(p.seeds, p.fetchAddrFromStore(cfg.NodeId))
peer, err := p.peerHub.peer(cfg.NodeId)
if err != nil {
log.Fatal("cannot get the added peer:", err)
@ -311,16 +307,6 @@ func (p *participant) send(msgs []raft.Message) {
}
}
func (p *participant) fetchAddrFromStore(nodeId int64) string {
pp := path.Join(v2machineKVPrefix, fmt.Sprint(nodeId))
if ev, err := p.Get(pp, false, false); err == nil {
if m, err := url.ParseQuery(*ev.Node.Value); err == nil {
return m["raft"][0]
}
}
return ""
}
func (p *participant) join() {
info := &context{
MinVersion: store.MinVersion(),