Skip to content

CORENET-6605: add retry logic for transient api server errors #2862

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

Open
jluhrsen wants to merge 1 commit into
base: master
Choose a base branch
from
+25 −1
Open

CORENET-6605: add retry logic for transient api server errors #2862

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
26 changes: 25 additions & 1 deletion pkg/apply/apply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"
"log"
"strings"
"time"

cnoclient "github.com/openshift/cluster-network-operator/pkg/client"
"github.com/openshift/cluster-network-operator/pkg/names"
Expand All @@ -16,6 +17,8 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/util/retry"
utilpointer "k8s.io/utils/ptr"
)

Expand Down Expand Up @@ -123,8 +126,29 @@ func ApplyObject(ctx context.Context, client cnoclient.Client, obj Object, subco
return fmt.Errorf("could not encode for patching: %w", err)
}

_, err = clusterClient.Dynamic().Resource(rm.Resource).Namespace(namespace).Patch(ctx, name, types.ApplyPatchType, data, patchOptions, subresources...)
// Retry with backoff to handle transient API server issues.
var backoff = wait.Backoff{
Steps: 6,
Duration: 5 * time.Second,
Factor: 1.0,
Jitter: 0.1,
}

var attempt int
err = retry.OnError(backoff, func(err error) bool {
// Don't retry on context cancellation (graceful shutdown)
return !errors.Is(err, context.Canceled) && !errors.Is(err, context.DeadlineExceeded)
}, func() error {
attempt++
_, err := clusterClient.Dynamic().Resource(rm.Resource).Namespace(namespace).Patch(ctx, name, types.ApplyPatchType, data, patchOptions, subresources...)
if err != nil {
log.Printf("Error applying %s (attempt %d/%d): %v", objDesc, attempt, backoff.Steps, err)
}
return err
})

if err != nil {
log.Printf("Failed to apply %s after %d attempts", objDesc, attempt)
return fmt.Errorf("failed to apply / update %s: %w", objDesc, err)
}

Expand Down