Browse Source

Return tsdb.ErrOutOfBounds as storage.ErrOutOfBounds

Signed-off-by: Goutham Veeramachaneni <cs14btech11014@iith.ac.in>
pull/2906/head
Goutham Veeramachaneni 7 years ago
parent
commit
243419c007
  1. 2
      retrieval/scrape.go
  2. 4
      storage/tsdb/tsdb.go

2
retrieval/scrape.go

@ -852,7 +852,7 @@ loop:
sl.l.With("numDropped", numDuplicates).Warn("Error on ingesting samples with different value but same timestamp")
}
if numOutOfBounds > 0 {
sl.l.With("numOutOfBounds", numOutOfBounds).Warn("Error on ingesting samples that are too old")
sl.l.With("numOutOfBounds", numOutOfBounds).Warn("Error on ingesting samples that are too old or are too far into the future")
}
if err == nil {
sl.cache.forEachStale(func(lset labels.Labels) bool {

4
storage/tsdb/tsdb.go

@ -125,6 +125,8 @@ func (a appender) Add(lset labels.Labels, t int64, v float64) (string, error) {
return "", storage.ErrOutOfOrderSample
case tsdb.ErrAmendSample:
return "", storage.ErrDuplicateSampleForTimestamp
case tsdb.ErrOutOfBounds:
return "", storage.ErrOutOfBounds
}
return ref, err
}
@ -139,6 +141,8 @@ func (a appender) AddFast(ref string, t int64, v float64) error {
return storage.ErrOutOfOrderSample
case tsdb.ErrAmendSample:
return storage.ErrDuplicateSampleForTimestamp
case tsdb.ErrOutOfBounds:
return storage.ErrOutOfBounds
}
return err
}

Loading…
Cancel
Save