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

etcdserver: use id,cid

Browse Source
This commit is contained in:
Xiang Li 2014-10-20 16:35:41 -07:00
parent dc68dc9ebd
commit 0fd28169c8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etcdserver/server.go
View File

@ -639,7 +639,7 @@ func startNode(cfg *ServerConfig) (id, cid uint64, n raft.Node, w *wal.WAL) {
peers[i] = raft.Peer{ID: id, Context: ctx}
}
id, cid = cfg.ID(), cfg.Cluster.ID()
log.Printf("etcdserver: start node %d in cluster %d", cfg.ID(), cfg.Cluster.ID())
log.Printf("etcdserver: start node %d in cluster %d", id, cid)
n = raft.StartNode(cfg.ID(), peers, 10, 1)
return
}
@ -658,8 +658,7 @@ func restartNode(cfg *ServerConfig, index uint64, snapshot *raftpb.Snapshot) (id
var metadata pb.Metadata
pbutil.MustUnmarshal(&metadata, wmetadata)
id, cid = metadata.NodeID, metadata.ClusterID
log.Printf("etcdserver: restart node %d in cluster %d at commit index %d",
metadata.NodeID, metadata.ClusterID, st.Commit)
log.Printf("etcdserver: restart node %d in cluster %d at commit index %d", id, cid, st.Commit)
n = raft.RestartNode(id, 10, 1, snapshot, st, ents)
return
}