From 744c73e019be956a9ad6cf789bed1241fd9f17e2 Mon Sep 17 00:00:00 2001
From: Gyuho Lee <gyuhox@gmail.com>
Date: Tue, 10 Apr 2018 13:57:17 -0700
Subject: [PATCH] etcdserver: fix "lease_expired_total" metrics

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
---
 etcdserver/server.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/etcdserver/server.go b/etcdserver/server.go
index 4307eddac..72db6d3bf 100644
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@@ -821,10 +821,13 @@ func (s *EtcdServer) run() {
 					lid := lease.ID
 					s.goAttach(func() {
 						ctx := s.authStore.WithRoot(s.ctx)
-						if _, lerr := s.LeaseRevoke(ctx, &pb.LeaseRevokeRequest{ID: int64(lid)}); lerr != nil {
+						_, lerr := s.LeaseRevoke(ctx, &pb.LeaseRevokeRequest{ID: int64(lid)})
+						if lerr == nil {
+							leaseExpired.Inc()
+						} else {
 							plog.Warningf("failed to revoke %016x (%q)", lid, lerr.Error())
 						}
-						leaseExpired.Inc()
+
 						<-c
 					})
 				}