Merge pull request #9557 from gyuho/lease-metrics

etcdserver: fix "lease_expired_total" metrics
2018-04-10 16:00:29 -07:00 · 2018-04-10 16:00:29 -07:00 · 943962d419
parent cf0a138d83 744c73e019
commit 943962d419
1 changed files with 5 additions and 2 deletions
--- 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
 					})
 				}