Skip to content

[CONTINT] Retry event checkpoint read #53752

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
gh-worker-dd-mergequeue-cf854d merged 3 commits into from
Jul 20, 2026
Merged

[CONTINT] Retry event checkpoint read #53752

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
67189f7
Retry event checkpoint read and distinguish not-found from other Conf…
triviajon Jul 15, 2026
2b5cc01
bazel run //:gazelle
triviajon Jul 16, 2026
108d7e2
Merge branch 'main' into triviajon/dev/event-checkpoint-retry
triviajon Jul 20, 2026
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: 24 additions & 2 deletions pkg/collector/corechecks/cluster/kubernetesapiserver/kubernetes_apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,15 +372,37 @@ func (k *KubeASCheck) startEventCollection() error {
k.mu.Unlock()

// If the checkpoint is present, seed the watermark from it so the initial list only forwards newer events.
if resVer, _, err := k.ac.GetTokenFromConfigmap(eventTokenKey); err != nil {
log.Warnf("Could not read persisted event checkpoint, starting fresh: %s", err)
resVer, err := k.readEventCheckpointWithRetry()
if err != nil {
log.Warnf("Could not read persisted event checkpoint after retries, starting fresh: %s", err)
} else {
ec.SetCheckpoint(resVer)
}

return ec.Start(stopCh)
}

// readEventCheckpointWithRetry reads the persisted event checkpoint, retrying with backoff
func (k *KubeASCheck) readEventCheckpointWithRetry() (string, error) {
const maxAttempts = 5

delay := time.Second
var lastErr error
for attempt := 1; attempt <= maxAttempts; attempt++ {
resVer, _, err := k.ac.GetTokenFromConfigmap(eventTokenKey)
if err == nil {
return resVer, nil
}
lastErr = err
if attempt < maxAttempts {
log.Warnf("Could not read persisted event checkpoint (attempt %d/%d): %s", attempt, maxAttempts, err)
time.Sleep(delay)
delay *= 2
}
}
return "", lastErr
}

// stopEventCollection stops the running EventCollector by closing its stop
// channel. It is idempotent.
func (k *KubeASCheck) stopEventCollection() {
Expand Down
4 changes: 4 additions & 0 deletions pkg/util/kubernetes/apiserver/apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (

v1 "k8s.io/api/core/v1"
"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
Expand Down Expand Up @@ -506,6 +507,9 @@ func (c *APIClient) ComponentStatuses() (*v1.ComponentStatusList, error) {
func (c *APIClient) getOrCreateConfigMap(name, namespace string) (cmEvent *v1.ConfigMap, err error) {
cmEvent, err = c.Cl.CoreV1().ConfigMaps(namespace).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
if !apierrors.IsNotFound(err) {
return nil, fmt.Errorf("could not get the ConfigMap %s: %w", name, err)
}
log.Errorf("Could not get the ConfigMap %s: %s, trying to create it.", name, err.Error())
cmEvent, err = c.Cl.CoreV1().ConfigMaps(namespace).Create(context.TODO(), &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Expand Down
Loading