mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

first round of comments

Browse Source 
Conflicts:
	etcdserver/config.go
	etcdserver/config_test.go
	etcdserver/server.go
	main.go
This commit is contained in:
Barak Michener
2014-10-13 18:40:25 -04:00
parent 456d1ebcae
commit 1ca7c031ff
5 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
etcdserver/server.go
View File

@ -180,7 +180,7 @@ func NewServer(cfg *ServerConfig) *EtcdServer {
log.Fatalf("etcdserver: %v", err)
}
if cfg.ShouldDiscover() {
d, err := discovery.New(cfg.DiscoveryURL, cfg.ID(), cfg.Cluster.String())
d, err := discovery.New(cfg.DiscoveryURL, cfg.NodeID, cfg.Cluster.String())
if err != nil {
log.Fatalf("etcdserver: cannot init discovery %v", err)
}
@ -213,17 +213,17 @@ func NewServer(cfg *ServerConfig) *EtcdServer {
cls := &clusterStore{Store: st, id: cid}
sstats := &stats.ServerStats{
Name: cfg.LocalMember.Attributes.Name,
ID: idAsHex(cfg.ID()),
Name: cfg.Name,
ID: idAsHex(cfg.NodeID),
}
lstats := stats.NewLeaderStats(idAsHex(cfg.ID()))
lstats := stats.NewLeaderStats(idAsHex(cfg.NodeID))
s := &EtcdServer{
store: st,
node: n,
id: id,
clusterID: cid,
attributes: Attributes{Name: cfg.LocalMember.Attributes.Name, ClientURLs: cfg.ClientURLs.StringSlice()},
attributes: Attributes{Name: cfg.Name, ClientURLs: cfg.ClientURLs.StringSlice()},
storage: struct {
*wal.WAL
*snap.Snapshotter
@ -640,7 +640,7 @@ func startNode(cfg *ServerConfig) (id, cid uint64, n raft.Node, w *wal.WAL) {
// TODO: remove the discoveryURL when it becomes part of the source for
// generating nodeID.
cfg.Cluster.GenID([]byte(cfg.DiscoveryURL))
metadata := pbutil.MustMarshal(&pb.Metadata{NodeID: cfg.ID(), ClusterID: cfg.Cluster.ID()})
metadata := pbutil.MustMarshal(&pb.Metadata{NodeID: cfg.NodeID, ClusterID: cfg.Cluster.ID()})
if w, err = wal.Create(cfg.WALDir(), metadata); err != nil {
log.Fatal(err)
}
@ -653,9 +653,9 @@ 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()
id, cid = cfg.NodeID, cfg.Cluster.ID()
log.Printf("etcdserver: start node %d in cluster %d", id, cid)
n = raft.StartNode(cfg.ID(), peers, 10, 1)
n = raft.StartNode(cfg.NodeID, peers, 10, 1)
return
}