Unverified Commit bda05a23 by Julien Pivotto Committed by GitHub

Merge pull request #8610 from roidelapluie/release2252

Release 2.25.2
parents 34ca0bb2 f9692a68
Pipeline #82675 passed with stages
in 5 minutes 43 seconds
## 2.25.2 / 2021-03-16
* [BUGFIX] Fix the ingestion of scrapes when the wall clock changes, e.g. on suspend. #8601
## 2.25.1 / 2021-03-14
* [BUGFIX] Fix a crash in `promtool` when a subquery with default resolution is used. #8569
......
......@@ -1005,7 +1005,7 @@ func (sl *scrapeLoop) run(interval, timeout time.Duration, errc chan<- error) {
var last time.Time
alignedScrapeTime := time.Now()
alignedScrapeTime := time.Now().Round(0)
ticker := time.NewTicker(interval)
defer ticker.Stop()
......@@ -1023,7 +1023,9 @@ mainLoop:
// Temporary workaround for a jitter in go timers that causes disk space
// increase in TSDB.
// See https://github.com/prometheus/prometheus/issues/7846
scrapeTime := time.Now()
// Calling Round ensures the time used is the wall clock, as otherwise .Sub
// and .Add on time.Time behave differently (see time package docs).
scrapeTime := time.Now().Round(0)
if AlignScrapeTimestamps && interval > 100*scrapeTimestampTolerance {
// For some reason, a tick might have been skipped, in which case we
// would call alignedScrapeTime.Add(interval) multiple times.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment