fix: limit number to rand.Intn (influxdata#362)

bonitoo-io · Nov 15, 2022 · cae80f4 · cae80f4
1 parent 6f2f8f9
commit cae80f4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## [unreleased]
 ### Bug fixes
 - [#363](https://github.com/influxdata/influxdb-client-go/pull/363) Generated server stubs return also error message from InfluxDB 1.x forward compatible API.  
+- [#364](https://github.com/influxdata/influxdb-client-go/pull/364) Fixed panic when retrying over a long period without a server connection.
 
 ## 2.12.0 [2022-10-27]
 ### Features

diff --git a/internal/write/service.go b/internal/write/service.go
@@ -255,7 +255,11 @@ func isIgnorableError(error *http2.Error) bool {
 func (w *Service) computeRetryDelay(attempts uint) uint {
 	minDelay := int(w.writeOptions.RetryInterval() * pow(w.writeOptions.ExponentialBase(), attempts))
 	maxDelay := int(w.writeOptions.RetryInterval() * pow(w.writeOptions.ExponentialBase(), attempts+1))
-	retryDelay := uint(rand.Intn(maxDelay-minDelay) + minDelay)
+	diff := maxDelay - minDelay
+	if diff <= 0 { //check overflows
+		return w.writeOptions.MaxRetryInterval()
+	}
+	retryDelay := uint(rand.Intn(diff) + minDelay)
 	if retryDelay > w.writeOptions.MaxRetryInterval() {
 		retryDelay = w.writeOptions.MaxRetryInterval()
 	}

diff --git a/internal/write/service_test.go b/internal/write/service_test.go
@@ -467,7 +467,10 @@ func TestComputeRetryDelay(t *testing.T) {
 	assertBetween(t, srv.computeRetryDelay(2), 20_000, 40_000)
 	assertBetween(t, srv.computeRetryDelay(3), 40_000, 80_000)
 	assertBetween(t, srv.computeRetryDelay(4), 80_000, 125_000)
-	assert.EqualValues(t, 125_000, srv.computeRetryDelay(5))
+
+	for i := uint(5); i < 200; i++ { //test also limiting higher values
+		assert.EqualValues(t, 125_000, srv.computeRetryDelay(i))
+	}
 }
 
 func TestErrorCallback(t *testing.T) {