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

Merge branch 'release-1.5'

This commit is contained in:
beorn7 2017-02-08 17:28:09 +01:00
parent be8b1eb656 eac9696a36
commit 242d8edcb5
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
storage/local/storage.go
View File

@ -1433,6 +1433,11 @@ func (s *MemorySeriesStorage) maintainMemorySeries(
// contains no chunks after dropping old chunks, it is purged entirely. In that // contains no chunks after dropping old chunks, it is purged entirely. In that
// case, the method returns true. // case, the method returns true.
// //
// If a persist error is encountered, the series is queued for quarantine. In
// that case, the method returns true, too, because the series should not be
// processed anymore (even if it will only be gone for real once quarantining
// has been completed).
//
// The caller must have locked the fp. // The caller must have locked the fp.
func (s *MemorySeriesStorage) writeMemorySeries( func (s *MemorySeriesStorage) writeMemorySeries(
fp model.Fingerprint, series *memorySeries, beforeTime model.Time, fp model.Fingerprint, series *memorySeries, beforeTime model.Time,
@ -1474,7 +1479,7 @@ func (s *MemorySeriesStorage) writeMemorySeries(
var offset int var offset int
offset, persistErr = s.persistence.persistChunks(fp, chunks) offset, persistErr = s.persistence.persistChunks(fp, chunks)
if persistErr != nil { if persistErr != nil {
return false return true
} }
if series.chunkDescsOffset == -1 { if series.chunkDescsOffset == -1 {
// This is the first chunk persisted for a newly created // This is the first chunk persisted for a newly created
@ -1488,10 +1493,10 @@ func (s *MemorySeriesStorage) writeMemorySeries(
newFirstTime, offset, numDroppedFromPersistence, allDroppedFromPersistence, persistErr := newFirstTime, offset, numDroppedFromPersistence, allDroppedFromPersistence, persistErr :=
s.persistence.dropAndPersistChunks(fp, beforeTime, chunks) s.persistence.dropAndPersistChunks(fp, beforeTime, chunks)
if persistErr != nil { if persistErr != nil {
return false return true
} }
if persistErr = series.dropChunks(beforeTime); persistErr != nil { if persistErr = series.dropChunks(beforeTime); persistErr != nil {
return false return true
} }
if len(series.chunkDescs) == 0 && allDroppedFromPersistence { if len(series.chunkDescs) == 0 && allDroppedFromPersistence {
// All chunks dropped from both memory and persistence. Delete the series for good. // All chunks dropped from both memory and persistence. Delete the series for good.