mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-26 06:04:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #5749 from meridional/fix-close

Browse source 
Fix potential panic when prometheus is watching multiple zookeeper paths
This commit is contained in:
Frederic Branczyk 2019-07-10 14:06:35 +02:00 committed by GitHub
parent 4c355837b7 9229811c94
commit dd598f906d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
discovery/zookeeper/zookeeper.go
View file

@ -109,6 +109,7 @@ type Discovery struct {
sources map[string]*targetgroup.Group sources map[string]*targetgroup.Group
updates chan treecache.ZookeeperTreeCacheEvent updates chan treecache.ZookeeperTreeCacheEvent
pathUpdates []chan treecache.ZookeeperTreeCacheEvent
treeCaches []*treecache.ZookeeperTreeCache treeCaches []*treecache.ZookeeperTreeCache
parse func(data []byte, path string) (model.LabelSet, error) parse func(data []byte, path string) (model.LabelSet, error)
@ -155,7 +156,9 @@ func NewDiscovery(
logger: logger, logger: logger,
} }
for _, path := range paths { for _, path := range paths {
sd.treeCaches = append(sd.treeCaches, treecache.NewZookeeperTreeCache(conn, path, updates, logger)) pathUpdate := make(chan treecache.ZookeeperTreeCacheEvent)
sd.pathUpdates = append(sd.pathUpdates, pathUpdate)
sd.treeCaches = append(sd.treeCaches, treecache.NewZookeeperTreeCache(conn, path, pathUpdate, logger))
} }
return sd, nil return sd, nil
} }
@ -166,12 +169,26 @@ func (d *Discovery) Run(ctx context.Context, ch chan<- []*targetgroup.Group) {
for _, tc := range d.treeCaches { for _, tc := range d.treeCaches {
tc.Stop() tc.Stop()
} }
for _, pathUpdate := range d.pathUpdates {
// Drain event channel in case the treecache leaks goroutines otherwise. // Drain event channel in case the treecache leaks goroutines otherwise.
for range d.updates { for range pathUpdate {
}
} }
d.conn.Close() d.conn.Close()
}() }()
for _, pathUpdate := range d.pathUpdates {
go func(update chan treecache.ZookeeperTreeCacheEvent) {
for event := range update {
select {
case d.updates <- event:
case <-ctx.Done():
return
}
}
}(pathUpdate)
}
for { for {
select { select {
case <-ctx.Done(): case <-ctx.Done():