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

style(server): changed a LeaderInfo struct field from "startTime" to "StartTime"

Browse Source 
Changed the LeaderInfo struct "start time" field from "startTime" to "StartTime" so that it is an exported identifier. This required adding the `json:"startTime"` structure field tag so that the encoding/json package correctly performs JSON encoding (i.e. the correct property name --> startTime).
This commit is contained in:
marc.barry 2014-05-21 10:23:04 -04:00
parent 22c944d8ef
commit 673d90728e
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

@ -626,7 +626,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))