mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

retrieval: fix missing scrape context cancellation (#2599)

Browse source
This commit is contained in:
Julius Volz 2017-05-11 16:15:07 +02:00 committed by GitHub
parent 0c3462762b
commit f160f17a6f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
retrieval/scrape.go
View file

@ -413,7 +413,7 @@ func (sl *scrapeLoop) run(interval, timeout time.Duration, errc chan<- error) {
if !sl.appender.NeedsThrottling() { if !sl.appender.NeedsThrottling() {
var ( var (
start = time.Now() start = time.Now()
scrapeCtx, _ = context.WithTimeout(sl.ctx, timeout) scrapeCtx, cancel = context.WithTimeout(sl.ctx, timeout)
numPostRelabelSamples = 0 numPostRelabelSamples = 0
) )
@ -425,6 +425,7 @@ func (sl *scrapeLoop) run(interval, timeout time.Duration, errc chan<- error) {
} }
samples, err := sl.scraper.scrape(scrapeCtx, start) samples, err := sl.scraper.scrape(scrapeCtx, start)
cancel()
if err == nil { if err == nil {
numPostRelabelSamples, err = sl.append(samples) numPostRelabelSamples, err = sl.append(samples)
} }