From b5f6e3c90c5893dfb035ffd8d0befc03a2e3358a Mon Sep 17 00:00:00 2001 From: Julius Volz Date: Mon, 21 Oct 2013 14:32:21 +0200 Subject: [PATCH] Fix watermarker default time / LevelDB key ordering bug. This fixes part 2) of https://github.com/prometheus/prometheus/issues/367 (uninitialized time.Time mapping to a higher LevelDB key than "normal" timestamps). Change-Id: Ib079974110a7b7c4757948f81fc47d3d29ae43c9 --- storage/metric/watermark.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/metric/watermark.go b/storage/metric/watermark.go index 88bfbd0b5..ccf16134d 100644 --- a/storage/metric/watermark.go +++ b/storage/metric/watermark.go @@ -67,7 +67,7 @@ func (w *LevelDBHighWatermarker) Get(f *clientmodel.Fingerprint) (t time.Time, o return t, ok, err } if !ok { - return t, ok, nil + return time.Unix(0, 0), ok, nil } t = time.Unix(v.GetTimestamp(), 0) return t, true, nil @@ -183,7 +183,7 @@ func (w *LevelDBCurationRemarker) Get(c *curationKey) (t time.Time, ok bool, err ok, err = w.p.Get(k, v) if err != nil || !ok { - return t, ok, err + return time.Unix(0, 0), ok, err } return time.Unix(v.GetLastCompletionTimestamp(), 0).UTC(), true, nil