From 1f241a12bd178bf277a2199d2dcb6e9d81a382d1 Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Wed, 23 May 2018 13:09:31 -0700 Subject: [PATCH] etcdserver: rename to "heartbeat_send_failures_total" Signed-off-by: Gyuho Lee --- etcdserver/metrics.go | 6 +++--- etcdserver/raft.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/etcdserver/metrics.go b/etcdserver/metrics.go index 6bdc0a7a6594..99462f47c5df 100644 --- a/etcdserver/metrics.go +++ b/etcdserver/metrics.go @@ -42,10 +42,10 @@ var ( Name: "leader_changes_seen_total", Help: "The number of leader changes seen.", }) - heartbeatFailures = prometheus.NewCounter(prometheus.CounterOpts{ + heartbeatSendFailures = prometheus.NewCounter(prometheus.CounterOpts{ Namespace: "etcd", Subsystem: "server", - Name: "heartbeat_failures_total", + Name: "heartbeat_send_failures_total", Help: "The total number of heartbeat send failures (likely overloaded from slow disk).", }) slowApplies = prometheus.NewCounter(prometheus.CounterOpts{ @@ -97,7 +97,7 @@ func init() { prometheus.MustRegister(hasLeader) prometheus.MustRegister(isLeader) prometheus.MustRegister(leaderChanges) - prometheus.MustRegister(heartbeatFailures) + prometheus.MustRegister(heartbeatSendFailures) prometheus.MustRegister(slowApplies) prometheus.MustRegister(proposalsCommitted) prometheus.MustRegister(proposalsApplied) diff --git a/etcdserver/raft.go b/etcdserver/raft.go index 089985c75d01..d53bf2efd5bb 100644 --- a/etcdserver/raft.go +++ b/etcdserver/raft.go @@ -368,7 +368,7 @@ func (r *raftNode) processMessages(ms []raftpb.Message) []raftpb.Message { // TODO: limit request rate. if r.lg != nil { r.lg.Warn( - "failed to send out heartbeat; took too long, server is overloaded likely from slow disk", + "leader failed to send out heartbeat on time; took too long, leader is overloaded likely from slow disk", zap.Duration("heartbeat-interval", r.heartbeat), zap.Duration("expected-duration", 2*r.heartbeat), zap.Duration("exceeded-duration", exceed), @@ -377,7 +377,7 @@ func (r *raftNode) processMessages(ms []raftpb.Message) []raftpb.Message { plog.Warningf("failed to send out heartbeat on time (exceeded the %v timeout for %v)", r.heartbeat, exceed) plog.Warningf("server is likely overloaded") } - heartbeatFailures.Inc() + heartbeatSendFailures.Inc() } } }