From d98d4a9bf04217f5b36fd3248cbe88d3046e84e4 Mon Sep 17 00:00:00 2001 From: Harkishen Singh Date: Fri, 6 Sep 2019 16:16:24 +0530 Subject: [PATCH] remove resetting of manager properties and init manager props under locking (#5979) Signed-off-by: Harkishen-Singh --- discovery/manager.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/discovery/manager.go b/discovery/manager.go index 1dbdecc8d0..4625e42a31 100644 --- a/discovery/manager.go +++ b/discovery/manager.go @@ -191,6 +191,9 @@ func (m *Manager) ApplyConfig(cfg map[string]sd_config.ServiceDiscoveryConfig) e } } m.cancelDiscoverers() + m.targets = make(map[poolKey]map[string]*targetgroup.Group) + m.providers = nil + m.discoverCancel = nil for name, scfg := range cfg { m.registerProviders(scfg, name) discoveredTargets.WithLabelValues(m.name, name).Set(0) @@ -280,9 +283,6 @@ func (m *Manager) cancelDiscoverers() { for _, c := range m.discoverCancel { c() } - m.targets = make(map[poolKey]map[string]*targetgroup.Group) - m.providers = nil - m.discoverCancel = nil } func (m *Manager) updateGroup(poolKey poolKey, tgs []*targetgroup.Group) {