Merge branch 'release-1.5'

2017-02-09 13:11:53 +01:00 · 2017-02-09 13:11:53 +01:00 · 9d12204da5
parent 242d8edcb5 0c688ab339
commit 9d12204da5
1 changed files with 2 additions and 1 deletions
--- a/storage/local/storage.go
+++ b/storage/local/storage.go
@ -1513,7 +1513,8 @@ func (s *MemorySeriesStorage) writeMemorySeries(
 		series.chunkDescsOffset -= numDroppedFromPersistence
 		if series.chunkDescsOffset < 0 {
 			persistErr = errors.New("dropped more chunks from persistence than from memory")
-			series.chunkDescsOffset = -1
+			series.chunkDescsOffset = 0
+			return true
 		}
 	}
 	return false