mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-30 07:59:40 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Merge pull request #1421 from prometheus/beorn7/fix

Browse source 
Fix a very special case of handling the checkpoint timer
This commit is contained in:
Björn Rabenstein 2016-02-23 22:25:27 +01:00
parent 17bfe798eb 8fa1560e48
commit 5eff37ccbe
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
storage/local/storage.go
View file

@ -966,6 +966,13 @@ loop:
} else { } else {
dirtySeriesCount = 0 dirtySeriesCount = 0
} }
// If a checkpoint takes longer than checkpointInterval, unluckily timed
// combination with the Reset(0) call below can lead to a case where a
// time is lurking in C leading to repeated checkpointing without break.
select {
case <-checkpointTimer.C: // Get rid of the lurking time.
default:
}
checkpointTimer.Reset(s.checkpointInterval) checkpointTimer.Reset(s.checkpointInterval)
case fp := <-memoryFingerprints: case fp := <-memoryFingerprints:
if s.maintainMemorySeries(fp, model.Now().Add(-s.dropAfter)) { if s.maintainMemorySeries(fp, model.Now().Add(-s.dropAfter)) {