RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2025-04-01 22:59:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2277 from prometheus/beorn7/storage2

Browse Source 
storage: Sanity-check number of loaded chunk descs
This commit is contained in:
Björn Rabenstein 2016-12-14 02:59:10 +01:00 committed by GitHub
commit 45570e5972
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
storage/local/series.go
View File

@ -462,10 +462,18 @@ func (s *memorySeries) preloadChunksForRange(
if err != nil { if err != nil {
return nopIter, err return nopIter, err
} }
if s.chunkDescsOffset != -1 && len(cds) != s.chunkDescsOffset {
return nopIter, fmt.Errorf(
"unexpected number of chunk descs loaded for fingerprint %v: expected %d, got %d",
fp, s.chunkDescsOffset, len(cds),
)
}
s.chunkDescs = append(cds, s.chunkDescs...) s.chunkDescs = append(cds, s.chunkDescs...)
s.chunkDescsOffset = 0 s.chunkDescsOffset = 0
s.persistWatermark += len(cds) s.persistWatermark += len(cds)
firstChunkDescTime = s.chunkDescs[0].FirstTime() if len(s.chunkDescs) > 0 {
firstChunkDescTime = s.chunkDescs[0].FirstTime()
}
} }
if len(s.chunkDescs) == 0 || through.Before(firstChunkDescTime) { if len(s.chunkDescs) == 0 || through.Before(firstChunkDescTime) {

3
storage/local/storage.go
View File

@ -938,6 +938,9 @@ func (s *MemorySeriesStorage) getOrCreateSeries(fp model.Fingerprint, m model.Me
// while (which is confusing as it makes the series // while (which is confusing as it makes the series
// appear as archived or purged). // appear as archived or purged).
cds, err = s.loadChunkDescs(fp, 0) cds, err = s.loadChunkDescs(fp, 0)
if err == nil && len(cds) == 0 {
err = fmt.Errorf("unarchived fingerprint %v (metric %v) has no chunks on disk", fp, m)
}
if err != nil { if err != nil {
s.quarantineSeries(fp, m, err) s.quarantineSeries(fp, m, err)
return nil, err return nil, err