Stop AWS Retryer if context is cancelled

bboreham · bboreham · commit 0443a18c46ff · 2020-05-07T14:38:26.000Z
Ingester.flushUserSeries() puts a timeout on the context, so don't
retry for longer than that.

Signed-off-by: Bryan Boreham &lt;bryan@weave.works&gt;
diff --git a/pkg/chunk/aws/retryer.go b/pkg/chunk/aws/retryer.go
@@ -42,7 +42,7 @@ func (r *retryer) RetryRules(req *request.Request) time.Duration {
 
 // ShouldRetry returns if the failed request is retryable.
 func (r *retryer) ShouldRetry(req *request.Request) bool {
-	return req.IsErrorRetryable() || req.IsErrorThrottle()
+	return r.Ongoing() && (req.IsErrorRetryable() || req.IsErrorThrottle())
 }
 
 // MaxRetries is the number of times a request may be retried before

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func (r retryer) RetryRules(req request.Request) time.Duration {`
`42`	`42`
`43`	`43`	`// ShouldRetry returns if the failed request is retryable.`
`44`	`44`	`func (r retryer) ShouldRetry(req request.Request) bool {`
`45`		`- return req.IsErrorRetryable() \|\| req.IsErrorThrottle()`
	`45`	`+ return r.Ongoing() && (req.IsErrorRetryable() \|\| req.IsErrorThrottle())`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`// MaxRetries is the number of times a request may be retried before`