mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-12-26 06:04:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'release-1.6'

Browse source
This commit is contained in:
beorn7 2017-05-09 11:16:07 +02:00
parent aaaec6431e e9c25131fe
commit 46226088aa
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
storage/local/storage.go
View file

@ -946,6 +946,7 @@ func (s *MemorySeriesStorage) Append(sample *model.Sample) error {
s.discardedSamples.WithLabelValues(outOfOrderTimestamp).Inc() s.discardedSamples.WithLabelValues(outOfOrderTimestamp).Inc()
return ErrOutOfOrderSample // Caused by the caller. return ErrOutOfOrderSample // Caused by the caller.
} }
headChunkWasClosed := series.headChunkClosed
completedChunksCount, err := series.add(model.SamplePair{ completedChunksCount, err := series.add(model.SamplePair{
Value: sample.Value, Value: sample.Value,
Timestamp: sample.Timestamp, Timestamp: sample.Timestamp,
@ -954,6 +955,11 @@ func (s *MemorySeriesStorage) Append(sample *model.Sample) error {
s.quarantineSeries(fp, sample.Metric, err) s.quarantineSeries(fp, sample.Metric, err)
return err return err
} }
if headChunkWasClosed {
// Appending to a series with a closed head chunk creates an
// additional open head chunk.
s.headChunks.Inc()
}
s.ingestedSamples.Inc() s.ingestedSamples.Inc()
s.incNumChunksToPersist(completedChunksCount) s.incNumChunksToPersist(completedChunksCount)