Merge pull request #319 from prometheus/fix/memory-delete-empty

Fix expunging of empty memory series (loop var pointerization bug)
pull/316/head
juliusv 12 years ago
commit 9726808a0e

@ -227,7 +227,7 @@ func (s *memorySeriesStorage) getOrCreateSeries(metric clientmodel.Metric, finge
} }
func (s *memorySeriesStorage) Flush(flushOlderThan time.Time, queue chan<- clientmodel.Samples) { func (s *memorySeriesStorage) Flush(flushOlderThan time.Time, queue chan<- clientmodel.Samples) {
emptySeries := clientmodel.Fingerprints{} emptySeries := []clientmodel.Fingerprint{}
s.RLock() s.RLock()
for fingerprint, stream := range s.fingerprintToSeries { for fingerprint, stream := range s.fingerprintToSeries {
@ -258,7 +258,7 @@ func (s *memorySeriesStorage) Flush(flushOlderThan time.Time, queue chan<- clien
stream.values = toKeep stream.values = toKeep
if len(toKeep) == 0 { if len(toKeep) == 0 {
emptySeries = append(emptySeries, &fingerprint) emptySeries = append(emptySeries, fingerprint)
} }
stream.Unlock() stream.Unlock()
} }
@ -266,8 +266,8 @@ func (s *memorySeriesStorage) Flush(flushOlderThan time.Time, queue chan<- clien
s.Lock() s.Lock()
for _, fingerprint := range emptySeries { for _, fingerprint := range emptySeries {
if s.fingerprintToSeries[*fingerprint].empty() { if s.fingerprintToSeries[fingerprint].empty() {
s.dropSeries(fingerprint) s.dropSeries(&fingerprint)
} }
} }
s.Unlock() s.Unlock()

Loading…
Cancel
Save