RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2025-02-05 06:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-1.5'

Browse Source
This commit is contained in:
beorn7 2017-02-09 13:11:53 +01:00
commit 9d12204da5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
storage/local/storage.go
View File

@ -1513,7 +1513,8 @@ func (s *MemorySeriesStorage) writeMemorySeries(
series.chunkDescsOffset -= numDroppedFromPersistence series.chunkDescsOffset -= numDroppedFromPersistence
if series.chunkDescsOffset < 0 { if series.chunkDescsOffset < 0 {
persistErr = errors.New("dropped more chunks from persistence than from memory") persistErr = errors.New("dropped more chunks from persistence than from memory")
series.chunkDescsOffset = -1 series.chunkDescsOffset = 0
return true
} }
} }
return false return false