vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #807 from Shopify/raft-server-stats-struct-field-tag-fix 

style(server): changed a LeaderInfo struct field from "startTime" to "StartTime"
release-0.4
Yicheng Qin 2014-06-05 12:45:34 -07:00
parent 757bb3af13 673d90728e
commit fbcfe8e1c4
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/peer_server.go
View File

@ -627,7 +627,7 @@ func (s *PeerServer) joinByPeer(server raft.Server, peer string, scheme string)
} }
func (s *PeerServer) Stats() []byte { func (s *PeerServer) Stats() []byte {
s.serverStats.LeaderInfo.Uptime = time.Now().Sub(s.serverStats.LeaderInfo.startTime).String() s.serverStats.LeaderInfo.Uptime = time.Now().Sub(s.serverStats.LeaderInfo.StartTime).String()
// TODO: register state listener to raft to change this field // TODO: register state listener to raft to change this field
// rather than compare the state each time Stats() is called. // rather than compare the state each time Stats() is called.

12
server/raft_server_stats.go
View File

@ -13,9 +13,9 @@ type raftServerStats struct {
StartTime time.Time `json:"startTime"` StartTime time.Time `json:"startTime"`
LeaderInfo struct { LeaderInfo struct {
Name string `json:"leader"` Name string `json:"leader"`
Uptime string `json:"uptime"` Uptime string `json:"uptime"`
startTime time.Time StartTime time.Time `json:"startTime"`
} `json:"leaderInfo"` } `json:"leaderInfo"`
RecvAppendRequestCnt uint64 `json:"recvAppendRequestCnt,"` RecvAppendRequestCnt uint64 `json:"recvAppendRequestCnt,"`
@ -43,7 +43,7 @@ func NewRaftServerStats(name string) *raftServerStats {
back: -1, back: -1,
}, },
} }
stats.LeaderInfo.startTime = time.Now() stats.LeaderInfo.StartTime = time.Now()
return stats return stats
} }
@ -54,7 +54,7 @@ func (ss *raftServerStats) RecvAppendReq(leaderName string, pkgSize int) {
ss.State = raft.Follower ss.State = raft.Follower
if leaderName != ss.LeaderInfo.Name { if leaderName != ss.LeaderInfo.Name {
ss.LeaderInfo.Name = leaderName ss.LeaderInfo.Name = leaderName
ss.LeaderInfo.startTime = time.Now() ss.LeaderInfo.StartTime = time.Now()
} }
ss.recvRateQueue.Insert(NewPackageStats(time.Now(), pkgSize)) ss.recvRateQueue.Insert(NewPackageStats(time.Now(), pkgSize))
@ -70,7 +70,7 @@ func (ss *raftServerStats) SendAppendReq(pkgSize int) {
if ss.State != raft.Leader { if ss.State != raft.Leader {
ss.State = raft.Leader ss.State = raft.Leader
ss.LeaderInfo.Name = ss.Name ss.LeaderInfo.Name = ss.Name
ss.LeaderInfo.startTime = now ss.LeaderInfo.StartTime = now
} }
ss.sendRateQueue.Insert(NewPackageStats(now, pkgSize)) ss.sendRateQueue.Insert(NewPackageStats(now, pkgSize))