Skip to content

fix(server/etcdserver/api/v3compactor): fix flaky TestPeriodicHourly and others with Retry Mechanism #19748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahrtr merged 1 commit into from
Apr 29, 2025
Merged

fix(server/etcdserver/api/v3compactor): fix flaky TestPeriodicHourly and others with Retry Mechanism #19748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 28 additions & 7 deletions server/etcdserver/api/v3compactor/periodic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ package v3compactor

import (
"errors"
"fmt"
"reflect"
"testing"
"time"
Expand Down Expand Up @@ -49,7 +50,7 @@ func TestPeriodicHourly(t *testing.T) {
}

// very first compaction
a, err := compactable.Wait(1)
a, err := waitWithRetry(t, compactable)
if err != nil {
t.Fatal(err)
}
Expand All @@ -67,7 +68,7 @@ func TestPeriodicHourly(t *testing.T) {
fc.Advance(tb.getRetryInterval())
}

a, err = compactable.Wait(1)
a, err = waitWithRetry(t, compactable)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -100,7 +101,7 @@ func TestPeriodicMinutes(t *testing.T) {
}

// very first compaction
a, err := compactable.Wait(1)
a, err := waitWithRetry(t, compactable)
if err != nil {
t.Fatal(err)
}
Expand All @@ -117,7 +118,7 @@ func TestPeriodicMinutes(t *testing.T) {
fc.Advance(tb.getRetryInterval())
}

a, err := compactable.Wait(1)
a, err := waitWithRetry(t, compactable)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -162,7 +163,7 @@ func TestPeriodicPause(t *testing.T) {
fc.Advance(tb.getRetryInterval())

// T=3h6m
a, err := compactable.Wait(1)
a, err := waitWithRetry(t, compactable)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -197,7 +198,7 @@ func TestPeriodicSkipRevNotChange(t *testing.T) {
}

// very first compaction
a, err := compactable.Wait(1)
a, err := waitWithRetry(t, compactable)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -228,7 +229,7 @@ func TestPeriodicSkipRevNotChange(t *testing.T) {
fc.Advance(tb.getRetryInterval())
}

a, err = compactable.Wait(1)
a, err = waitWithRetry(t, compactable)
if err != nil {
t.Fatal(err)
}
Expand All @@ -244,3 +245,23 @@ func waitOneAction(t *testing.T, r testutil.Recorder) {
t.Errorf("expect 1 action, got %v instead", len(actions))
}
}

func waitWithRetry(t *testing.T, compactable *fakeCompactable) ([]testutil.Action, error) {
t.Helper()

var lastErr error
var actions []testutil.Action

expectedActions, maxRetries := 1, 5
for retry := 0; retry < maxRetries; retry++ {
actions, lastErr = compactable.Wait(expectedActions)
if lastErr == nil || len(actions) >= expectedActions {
return actions, nil
}
// Exponential backoff
backoffTime := time.Duration(10*(1<<retry)) * time.Millisecond
t.Logf("Retry %d: waiting %v before next attempt (last error: %v)", retry+1, backoffTime, lastErr)
Copy link
Member

@ahrtr ahrtr Apr 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: %s is more human readable

Suggested change
t.Logf("Retry %d: waiting %v before next attempt (last error: %v)", retry+1, backoffTime, lastErr)
t.Logf("Retry %d: waiting %s before next attempt (last error: %v)", retry+1, backoffTime, lastErr)

time.Sleep(backoffTime)
}
return nil, fmt.Errorf("after %d retries, last error: %w", maxRetries, lastErr)
}