From 996fd958ac12a7906367470fe2f6bdd05f56f608 Mon Sep 17 00:00:00 2001 From: Wei Guo Date: Fri, 23 Nov 2018 17:23:55 +0800 Subject: [PATCH] fix deadlock in scrape manager (#4894) Scrape manager will fall in deadlock when we reload configs frequently. --- scrape/manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scrape/manager.go b/scrape/manager.go index 8cf75d9e1..4e38b6996 100644 --- a/scrape/manager.go +++ b/scrape/manager.go @@ -110,7 +110,7 @@ func (m *Manager) reload() { scrapeConfig, ok := m.scrapeConfigs[setName] if !ok { level.Error(m.logger).Log("msg", "error reloading target set", "err", "invalid config id:"+setName) - return + continue } sp = newScrapePool(scrapeConfig, m.append, log.With(m.logger, "scrape_pool", setName)) m.scrapePools[setName] = sp