Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions retry.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,14 @@ func isDoNotRetryError(err error) bool {
}

func newBackoffWithJitter(min, max time.Duration) *backoffWithJitter {
// Explicit zero min and max yields constant zero delay between retries (#992).
if min == 0 && max == 0 {
return &backoffWithJitter{
rnd: rand.New(rand.NewPCG(rand.Uint64(), rand.Uint64())),
min: 0,
max: 0,
}
}
if min <= 0 {
min = defaultWaitTime
}
Expand Down
34 changes: 33 additions & 1 deletion retry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1187,7 +1187,7 @@ func TestRetryConstantDelayUsingStrategy(t *testing.T) {

func TestRetryCoverage(t *testing.T) {
t.Run("apply retry default min and max value", func(t *testing.T) {
backoff := newBackoffWithJitter(0, 0)
backoff := newBackoffWithJitter(0, defaultMaxWaitTime)
assertEqual(t, defaultWaitTime, backoff.min)
assertEqual(t, defaultMaxWaitTime, backoff.max)

Expand All @@ -1198,6 +1198,13 @@ func TestRetryCoverage(t *testing.T) {
assertEqual(t, 2*time.Second, dur2)
})

t.Run("explicit zero min and max yields zero delay", func(t *testing.T) {
backoff := newBackoffWithJitter(0, 0)
assertEqual(t, time.Duration(0), backoff.min)
assertEqual(t, time.Duration(0), backoff.max)
assertEqual(t, time.Duration(0), backoff.balanceMinMax(0))
})

t.Run("retry condition nil response", func(t *testing.T) {
result := RetryConditionStatusTooManyRequests(nil, nil)
assertFalse(t, result, "expected no retry for nil response")
Expand Down Expand Up @@ -1233,3 +1240,28 @@ func testStaticTime(t *testing.T) {
timeNow = time.Now
})
}

func TestTraceInfoTotalTimeIncludesRetryWait(t *testing.T) {
ts := createGetServer(t)
defer ts.Close()

retryWaitTime := 100 * time.Millisecond

c := dcnl().
SetTrace(true).
SetRetryCount(2).
SetRetryWaitTime(retryWaitTime).
SetRetryMaxWaitTime(retryWaitTime).
AddRetryConditions(func(*Response, error) bool { return true })

resp, err := c.R().Get(ts.URL + "/set-retrywaittime-test")
assertNil(t, err)
assertNotNil(t, resp)
assertEqual(t, 3, resp.Request.Attempt)

tr := resp.Request.TraceInfo()
if tr.TotalTime < 2*retryWaitTime-retryWaitTime/2 {
t.Fatalf("TotalTime should include retry backoff, got %v", tr.TotalTime)
}
assertTrue(t, tr.TotalTime == resp.Duration())
}
Loading