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

server: save correct nodeId for participant

Browse Source
This commit is contained in:
Yicheng Qin 2014-07-28 15:58:28 -07:00
parent 12dd380d26
commit a6132d459f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etcd/participant.go
View File

@ -113,14 +113,16 @@ func newParticipant(id int64, pubAddr string, raftPubAddr string, dir string, cl
if !os.IsNotExist(err) { if !os.IsNotExist(err) {
return nil, err return nil, err
} }
p.id = id
p.pubAddr = pubAddr
p.raftPubAddr = raftPubAddr
if w, err = wal.New(walPath); err != nil { if w, err = wal.New(walPath); err != nil {
return nil, err return nil, err
} }
w.SaveInfo(p.id) w.SaveInfo(p.id)
p.id = id
p.pubAddr = pubAddr
p.raftPubAddr = raftPubAddr
p.node.Node = raft.New(p.id, defaultHeartbeat, defaultElection) p.node.Node = raft.New(p.id, defaultHeartbeat, defaultElection)
log.Printf("id=%x participant.new path=%s\n", p.id, walPath)
} else { } else {
n, err := w.LoadNode() n, err := w.LoadNode()
if err != nil { if err != nil {
@ -128,6 +130,7 @@ func newParticipant(id int64, pubAddr string, raftPubAddr string, dir string, cl
} }
p.id = n.Id p.id = n.Id
p.node.Node = raft.Recover(n.Id, n.Ents, n.State, defaultHeartbeat, defaultElection) p.node.Node = raft.Recover(n.Id, n.Ents, n.State, defaultHeartbeat, defaultElection)
log.Printf("id=%x participant.load path=%s\n", p.id, walPath)
} }
p.w = w p.w = w