RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-26 08:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #439 from prometheus/beorn7/remove-deadlock

Browse Source 
Remove a deadlock during shutdown.
This commit is contained in:
Björn Rabenstein 2015-01-07 19:18:40 +01:00
commit 7aae5dd873
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
storage/local/storage.go
View File

@ -424,7 +424,7 @@ func (s *memorySeriesStorage) preloadChunksForRange(
func (s *memorySeriesStorage) handleEvictList() {
ticker := time.NewTicker(maxEvictInterval)
count := 0
loop:
for {
// To batch up evictions a bit, this tries evictions at least
// once per evict interval, but earlier if the number of evict
@ -450,12 +450,20 @@ loop:
s.maybeEvict()
}
case <-s.evictStopping:
break loop
// Drain evictRequests to not let requesters hang.
for {
select {
case <-s.evictRequests:
// Do nothing.
default:
ticker.Stop()
glog.Info("Chunk eviction stopped.")
close(s.evictStopped)
return
}
}
}
}
ticker.Stop()
glog.Info("Chunk eviction stopped.")
close(s.evictStopped)
}
// maybeEvict is a local helper method. Must only be called by handleEvictList.