github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2025-03-11 15:34:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

lib/promscrape/discovery/kubernetes: fix deadlock in startWatcherForURL

Browse source 
reloadObjects must be called without holding aw.mu lock
This commit is contained in:
Aliaksandr Valialkin 2021-02-28 15:25:30 +02:00
parent b523e0369c
commit 68a0f5ce12
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/promscrape/discovery/kubernetes/api.go
View file

@ -217,14 +217,16 @@ func (aw *apiWatcher) startWatchersForRole(role string) {
func (aw *apiWatcher) startWatcherForURL(role, apiURL string, parseObject parseObjectFunc, parseObjectList parseObjectListFunc) {
aw.mu.Lock()
defer aw.mu.Unlock()
if aw.watchersByURL[apiURL] != nil {
// Watcher for the given path already exists.
aw.mu.Unlock()
return
}
uw := aw.newURLWatcher(role, apiURL, parseObject, parseObjectList)
resourceVersion := uw.reloadObjects()
aw.watchersByURL[apiURL] = uw
aw.mu.Unlock()
resourceVersion := uw.reloadObjects()
go func() {
uw.watchForUpdates(resourceVersion)
aw.mu.Lock()