github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2595 from prometheus/beorn7/storage4 

storage: Guard against appending to evicted chunk
pull/2569/merge
Björn Rabenstein 2017-04-07 00:51:53 +02:00 committed by GitHub
parent e5d7bbfc3c 7199a9d9d4
commit f0076aca01
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
storage/local/chunk/chunk.go
View File

@ -33,7 +33,10 @@ const ChunkLen = 1024
// DefaultEncoding can be changed via a flag.
var DefaultEncoding = DoubleDelta
var errChunkBoundsExceeded = errors.New("attempted access outside of chunk boundaries")
var (
errChunkBoundsExceeded = errors.New("attempted access outside of chunk boundaries")
errAddedToEvictedChunk = errors.New("attempted to add sample to evicted chunk")
)
// EvictRequest is a request to evict a chunk from memory.
type EvictRequest struct {
@ -133,6 +136,9 @@ func NewDesc(c Chunk, firstTime model.Time) *Desc {
// The chunk must be pinned, and the caller must have locked the fingerprint of
// the series.
func (d *Desc) Add(s model.SamplePair) ([]Chunk, error) {
if d.C == nil {
return nil, errAddedToEvictedChunk
}
return d.C.Add(s)
}