github
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
changes/52/52/1
Julius Volz 2013-10-21 14:32:21 +02:00
parent a1a97ed064
commit b5f6e3c90c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/metric/watermark.go
View File

@ -67,7 +67,7 @@ func (w *LevelDBHighWatermarker) Get(f *clientmodel.Fingerprint) (t time.Time, o
return t, ok, err return t, ok, err
} }
if !ok { if !ok {
return t, ok, nil return time.Unix(0, 0), ok, nil
} }
t = time.Unix(v.GetTimestamp(), 0) t = time.Unix(v.GetTimestamp(), 0)
return t, true, nil 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) ok, err = w.p.Get(k, v)
if err != nil || !ok { if err != nil || !ok {
return t, ok, err return time.Unix(0, 0), ok, err
} }
return time.Unix(v.GetLastCompletionTimestamp(), 0).UTC(), true, nil return time.Unix(v.GetLastCompletionTimestamp(), 0).UTC(), true, nil