RepoMirrors/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus synced 2024-12-28 09:42:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix expunging of empty memory series (loop var pointerization bug)
This commit is contained in:
juliusv 2013-06-26 09:08:16 -07:00
commit 9726808a0e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
storage/metric/memory.go
View File

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