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: init server stats before passing it as argument

Browse Source 
It is more reasonable to init the variable before passing it as an
argument.

It fixes a bug that etcdserver may panic on server stats when processing
a message from rafthttp streamReader before server stats is initialized
in server.Start().
This commit is contained in:
Yicheng Qin 2015-04-22 08:05:50 -07:00
parent 58f035844c
commit 8069d08b96
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etcdserver/server.go
View File

@ -239,6 +239,7 @@ func NewServer(cfg *ServerConfig) (*EtcdServer, error) {
Name: cfg.Name, Name: cfg.Name,
ID: id.String(), ID: id.String(),
} }
sstats.Initialize()
lstats := stats.NewLeaderStats(id.String()) lstats := stats.NewLeaderStats(id.String())
srv := &EtcdServer{ srv := &EtcdServer{
@ -299,7 +300,6 @@ func (s *EtcdServer) start() {
s.w = wait.New() s.w = wait.New()
s.done = make(chan struct{}) s.done = make(chan struct{})
s.stop = make(chan struct{}) s.stop = make(chan struct{})
s.stats.Initialize()
// TODO: if this is an empty log, writes all peer infos // TODO: if this is an empty log, writes all peer infos
// into the first entry // into the first entry
go s.run() go s.run()