Merge pull request #6161 from sinsharat/master

etcdserver: stats/server - refactored
release-3.1
Xiang Li 2016-08-11 17:03:23 -07:00 committed by GitHub
commit c33ea20fef
1 changed files with 5 additions and 8 deletions

View File

@ -123,17 +123,11 @@ func (ss *ServerStats) SendAppendReq(reqSize int) {
ss.Lock() ss.Lock()
defer ss.Unlock() defer ss.Unlock()
now := time.Now() ss.becomeLeader()
if ss.State != raft.StateLeader {
ss.State = raft.StateLeader
ss.LeaderInfo.Name = ss.ID
ss.LeaderInfo.StartTime = now
}
ss.sendRateQueue.Insert( ss.sendRateQueue.Insert(
&RequestStats{ &RequestStats{
SendingTime: now, SendingTime: time.Now(),
Size: reqSize, Size: reqSize,
}, },
) )
@ -144,7 +138,10 @@ func (ss *ServerStats) SendAppendReq(reqSize int) {
func (ss *ServerStats) BecomeLeader() { func (ss *ServerStats) BecomeLeader() {
ss.Lock() ss.Lock()
defer ss.Unlock() defer ss.Unlock()
ss.becomeLeader()
}
func (ss *ServerStats) becomeLeader() {
if ss.State != raft.StateLeader { if ss.State != raft.StateLeader {
ss.State = raft.StateLeader ss.State = raft.StateLeader
ss.LeaderInfo.Name = ss.ID ss.LeaderInfo.Name = ss.ID