Merge pull request #2071 from prometheus/beorn7/storage

Re-add counting of evict chunk ops and decrementing NumMemChunks

storage/local/chunk/chunk.go

@@ -252,6 +252,8 @@ func (d *Desc) MaybeEvict() bool {
 		panic("ChunkLastTime not populated for evicted chunk")
 	}
 	d.C = nil
+	Ops.WithLabelValues(Evict).Inc()
+	atomic.AddInt64(&NumMemChunks, -1)
 	return true
 }
 

storage/local/storage_test.go

@@ -20,6 +20,7 @@ import (
 	"math/rand"
 	"os"
 	"strconv"
+	"sync/atomic"
 	"testing"
 	"testing/quick"
 	"time"
@@ -1412,6 +1413,10 @@ func testEvictAndLoadChunkDescs(t *testing.T, encoding chunk.Encoding) {
 		Value:     model.SampleValue(3.14),
 	}
 
+	// Sadly, chunk.NumMemChunks is a global variable. We have to reset it
+	// explicitly here.
+	atomic.StoreInt64(&chunk.NumMemChunks, 0)
+
 	s, closer := NewTestStorage(t, encoding)
 	defer closer.Close()
 
@@ -1441,6 +1446,9 @@ func testEvictAndLoadChunkDescs(t *testing.T, encoding chunk.Encoding) {
 	if oldLen <= len(series.chunkDescs) {
 		t.Errorf("Expected number of chunkDescs to decrease, old number %d, current number %d.", oldLen, len(series.chunkDescs))
 	}
+	if int64(len(series.chunkDescs)) < atomic.LoadInt64(&chunk.NumMemChunks) {
+		t.Errorf("NumMemChunks is larger than number of chunk descs, number of chunk descs: %d, NumMemChunks: %d.", len(series.chunkDescs), atomic.LoadInt64(&chunk.NumMemChunks))
+	}
 
 	// Load everything back.
 	it := s.preloadChunksForRange(makeFingerprintSeriesPair(s, fp), 0, 100000)