From 487c8d3d61d105b9b14c2c8177de00ecc6a580b5 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 | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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