mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-28 23:19:41 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1024 from prometheus/fix-updatetargets-busyloop

Browse source 
Fix busylooping in case of no target providers.
This commit is contained in:
Julius Volz 2015-08-24 17:14:56 +02:00
parent 8769a75183 d36a7f4e6f
commit 25a8bd50a5
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
retrieval/targetmanager.go
View file

@ -171,12 +171,15 @@ func (tm *TargetManager) Run() {
tm.running = true tm.running = true
} }
// handleTargetUpdates receives target group updates and handles them in the // handleUpdates receives target group updates and handles them in the
// context of the given job config. // context of the given job config.
func (tm *TargetManager) handleUpdates(ch <-chan targetGroupUpdate, done <-chan struct{}) { func (tm *TargetManager) handleUpdates(ch <-chan targetGroupUpdate, done <-chan struct{}) {
for { for {
select { select {
case update := <-ch: case update, ok := <-ch:
if !ok {
return
}
if update.tg == nil { if update.tg == nil {
break break
} }

7
retrieval/targetmanager_test.go
View file

@ -376,3 +376,10 @@ func TestTargetManagerConfigUpdate(t *testing.T) {
} }
} }
} }
func TestHandleUpdatesReturnsWhenUpdateChanIsClosed(t *testing.T) {
tm := NewTargetManager(nopAppender{})
ch := make(chan targetGroupUpdate)
close(ch)
tm.handleUpdates(ch, make(chan struct{}))
}