Merge pull request #9562 from disksing/data-race

etcdserver/stats: fix stats data race.
etcd-io · Apr 12, 2018 · 836fffa · 836fffa
2 parents 2c1840c + 10bf028
commit 836fffa
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/etcdserver/stats/server.go b/etcdserver/stats/server.go
@@ -74,10 +74,10 @@ type serverStats struct {
 func (ss *ServerStats) JSON() []byte {
 	ss.Lock()
 	stats := ss.serverStats
-	ss.Unlock()
-	stats.LeaderInfo.Uptime = time.Since(stats.LeaderInfo.StartTime).String()
 	stats.SendingPkgRate, stats.SendingBandwidthRate = stats.sendRateQueue.Rate()
 	stats.RecvingPkgRate, stats.RecvingBandwidthRate = stats.recvRateQueue.Rate()
+	stats.LeaderInfo.Uptime = time.Since(stats.LeaderInfo.StartTime).String()
+	ss.Unlock()
 	b, err := json.Marshal(stats)
 	// TODO(jonboulle): appropriate error handling?
 	if err != nil {