Merge pull request #349 from prometheus/refactor/storage/componentize

Hot Fix: Use extracted time.
pull/350/head
juliusv 11 years ago
commit 881e3fb6be

@ -328,19 +328,15 @@ func (t *TieredStorage) seriesTooOld(f *clientmodel.Fingerprint, i time.Time) (b
}
}
value := &dto.MetricHighWatermark{}
k := &dto.Fingerprint{}
dumpFingerprint(k, f)
_, diskHit, err := t.DiskStorage.MetricHighWatermarks.Get(f)
highTime, diskHit, err := t.DiskStorage.MetricHighWatermarks.Get(f)
if err != nil {
return false, err
}
if diskHit {
wmTime := time.Unix(*value.Timestamp, 0).UTC()
t.wmCache.Set(f, &watermarks{High: wmTime})
t.wmCache.Set(f, &watermarks{High: highTime})
return wmTime.Before(i), nil
return highTime.Before(i), nil
}
t.wmCache.Set(f, &watermarks{})

Loading…
Cancel
Save