Merge pull request #2710 from prometheus/fabxc-patch-1

retrieval: add missing scrape context cancelation
8 years ago · 8e73bde650
parent bf64d4efa8 76b3378190
commit 8e73bde650
1 changed files with 4 additions and 3 deletions
--- a/retrieval/scrape.go
+++ b/retrieval/scrape.go
@ -469,9 +469,9 @@ func (sl *scrapeLoop) run(interval, timeout time.Duration, errc chan<- error) {
 		}

 		var (
-			total, added int
-			start        = time.Now()
-			scrapeCtx, _ = context.WithTimeout(sl.ctx, timeout)
+			total, added      int
+			start             = time.Now()
+			scrapeCtx, cancel = context.WithTimeout(sl.ctx, timeout)
 		)

 		// Only record after the first scrape.
@ -482,6 +482,7 @@ func (sl *scrapeLoop) run(interval, timeout time.Duration, errc chan<- error) {
 		}

 		err := sl.scraper.scrape(scrapeCtx, buf)
+		cancel()
 		if err == nil {
 			b := buf.Bytes()