Merge pull request #1549 from go-redis/feature/retry-overflow

vmihailenco · web-flow · commit 51a4ea435842 · 2020-10-28T12:01:51.000+02:00
Guard against overflow in retry
diff --git a/internal/internal.go b/internal/internal.go
@@ -15,6 +15,10 @@ func RetryBackoff(retry int, minBackoff, maxBackoff time.Duration) time.Duration
 	}
 
 	d := minBackoff << uint(retry)
+	if d < minBackoff {
+		return maxBackoff
+	}
+
 	d = minBackoff + time.Duration(rand.Int63n(int64(d)))
 
 	if d > maxBackoff || d < minBackoff {

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,10 @@ func RetryBackoff(retry int, minBackoff, maxBackoff time.Duration) time.Duration`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`d := minBackoff << uint(retry)`
	`18`	`+ if d < minBackoff {`
	`19`	`+ return maxBackoff`
	`20`	`+ }`
	`21`	`+`
`18`	`22`	`d = minBackoff + time.Duration(rand.Int63n(int64(d)))`
`19`	`23`
`20`	`24`	`if d > maxBackoff \|\| d < minBackoff {`