mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #459 from prometheus/beorn7/fix-deadlock

Browse source 
Remove a deadlock during shutdown.
This commit is contained in:
Björn Rabenstein 2015-01-22 15:10:08 +01:00
parent edc91cbabb 2c8fdcbc23
commit f541390dfb
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
storage/local/storage.go
View file

@ -467,20 +467,19 @@ func (s *memorySeriesStorage) handleEvictList() {
s.maybeEvict() s.maybeEvict()
} }
case <-s.evictStopping: case <-s.evictStopping:
// Drain evictRequests to not let requesters hang. // Drain evictRequests forever in a goroutine to not let
// requesters hang.
go func() {
for { for {
select { <-s.evictRequests
case <-s.evictRequests: }
// Do nothing. }()
default:
ticker.Stop() ticker.Stop()
glog.Info("Chunk eviction stopped.") glog.Info("Chunk eviction stopped.")
close(s.evictStopped) close(s.evictStopped)
return return
} }
} }
}
}
} }
// maybeEvict is a local helper method. Must only be called by handleEvictList. // maybeEvict is a local helper method. Must only be called by handleEvictList.