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 #3252 from LK4D4/proper_reset

Browse source 
[storage/local] fix timer.Reset usage
This commit is contained in:
Björn Rabenstein 2017-10-06 13:31:07 +02:00 committed by GitHub
parent 128b31d058 7e814ada72
commit a5412cfc59
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
storage/local/storage.go
View file

@ -998,7 +998,8 @@ func (s *MemorySeriesStorage) logThrottling() {
for { for {
select { select {
case <-s.throttled: case <-s.throttled:
if !timer.Reset(time.Minute) { if !timer.Stop() {
<-timer.C
score, _ := s.getPersistenceUrgencyScore() score, _ := s.getPersistenceUrgencyScore()
log. log.
With("urgencyScore", score). With("urgencyScore", score).
@ -1006,6 +1007,7 @@ func (s *MemorySeriesStorage) logThrottling() {
With("memoryChunks", atomic.LoadInt64(&chunk.NumMemChunks)). With("memoryChunks", atomic.LoadInt64(&chunk.NumMemChunks)).
Error("Storage needs throttling. Scrapes and rule evaluations will be skipped.") Error("Storage needs throttling. Scrapes and rule evaluations will be skipped.")
} }
timer.Reset(time.Minute)
case <-timer.C: case <-timer.C:
score, _ := s.getPersistenceUrgencyScore() score, _ := s.getPersistenceUrgencyScore()
log. log.