From 2b7ad35fa03df1f5cd14ae12d885683a00f8c458 Mon Sep 17 00:00:00 2001 From: Anthony Romano Date: Thu, 7 Apr 2016 20:14:30 -0700 Subject: [PATCH] v2http: only report capabilities on update --- etcdserver/api/v2http/capability.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/etcdserver/api/v2http/capability.go b/etcdserver/api/v2http/capability.go index 40477cac0..f5d0714af 100644 --- a/etcdserver/api/v2http/capability.go +++ b/etcdserver/api/v2http/capability.go @@ -55,15 +55,13 @@ func capabilityLoop(s *etcdserver.EtcdServer) { var pv *semver.Version for { if v := s.ClusterVersion(); v != pv { - if pv == nil { - pv = v - } else if v != nil && pv.LessThan(*v) { + if pv == nil || (v != nil && pv.LessThan(*v)) { pv = v + enableMapMu.Lock() + enabledMap = capabilityMaps[pv.String()] + enableMapMu.Unlock() + plog.Infof("enabled capabilities for version %s", pv) } - enableMapMu.Lock() - enabledMap = capabilityMaps[pv.String()] - enableMapMu.Unlock() - plog.Infof("enabled capabilities for version %s", pv) } select {