curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-7624: Fix flaky TestBackoffGracePeriod test in cloudflared

This commit is contained in:
João Oliveirinha 2023-07-24 14:39:25 +01:00
parent 9584adc38a
commit bfeaa3418d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retry/backoffhandler.go
View File

@ -91,10 +91,12 @@ func (b *BackoffHandler) Backoff(ctx context.Context) bool {
// Sets a grace period within which the the backoff timer is maintained. After the grace // Sets a grace period within which the the backoff timer is maintained. After the grace
// period expires, the number of retries & backoff duration is reset. // period expires, the number of retries & backoff duration is reset.
func (b *BackoffHandler) SetGracePeriod() { func (b *BackoffHandler) SetGracePeriod() time.Duration {
maxTimeToWait := b.GetBaseTime() * 2 << (b.retries + 1) maxTimeToWait := b.GetBaseTime() * 2 << (b.retries + 1)
timeToWait := time.Duration(rand.Int63n(maxTimeToWait.Nanoseconds())) timeToWait := time.Duration(rand.Int63n(maxTimeToWait.Nanoseconds()))
b.resetDeadline = Clock.Now().Add(timeToWait) b.resetDeadline = Clock.Now().Add(timeToWait)
return timeToWait
} }
func (b BackoffHandler) GetBaseTime() time.Duration { func (b BackoffHandler) GetBaseTime() time.Duration {

6
retry/backoffhandler_test.go
View File

@ -57,9 +57,9 @@ func TestBackoffGracePeriod(t *testing.T) {
t.Fatalf("backoff failed immediately") t.Fatalf("backoff failed immediately")
} }
// the next call to Backoff would fail unless it's after the grace period // the next call to Backoff would fail unless it's after the grace period
backoff.SetGracePeriod() gracePeriod := backoff.SetGracePeriod()
// advance time to after the grace period (~4 seconds) and see what happens // advance time to after the grace period, which at most will be 8 seconds, but we will advance +1 second.
currentTime = currentTime.Add(time.Second * 5) currentTime = currentTime.Add(gracePeriod + time.Second)
if !backoff.Backoff(ctx) { if !backoff.Backoff(ctx) {
t.Fatalf("backoff failed after the grace period expired") t.Fatalf("backoff failed after the grace period expired")
} }