Skip to content

fix: resolve readiness WaitReady blocking for 5 minutes on startup #408

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
AlinsRan wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −4
Open

fix: resolve readiness WaitReady blocking for 5 minutes on startup #408

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
11 changes: 7 additions & 4 deletions internal/manager/readiness/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@ func (r *readinessManager) Start(ctx context.Context) error {
})
}
if len(expected) > 0 {
r.log.V(1).Info("registering readiness state", "gvk", gvk, "expected", expected)
r.log.Info("registering readiness state", "gvk", gvk, "registered_count", len(expected))
r.log.V(1).Info("registered resources for readiness", "gvk", gvk, "resources", expected)
r.registerState(gvk, expected)
}
}
Expand All @@ -135,13 +136,12 @@ func (r *readinessManager) Start(ctx context.Context) error {
r.isReady.Store(true)
close(r.done)
}
r.log.Info("readiness manager started")
})
return err
}

func (r *readinessManager) registerState(gvk schema.GroupVersionKind, list []k8stypes.NamespacedName) {
r.mu.Lock()
defer r.mu.Unlock()
if _, ok := r.state[gvk]; !ok {
r.state[gvk] = make(map[k8stypes.NamespacedName]struct{})
}
Expand All @@ -155,9 +155,12 @@ func (r *readinessManager) Done(obj client.Object, nn k8stypes.NamespacedName) {
if r.IsReady() {
return
}
<-r.started

Comment on lines 155 to +159
r.mu.Lock()
defer r.mu.Unlock()
gvk := types.GvkOf(obj)
r.log.Info("marking resource as done", "gvk", gvk, "name", nn, "state_count", len(r.state[gvk]))
if _, ok := r.state[gvk]; !ok {
return
}
Expand Down Expand Up @@ -191,7 +194,7 @@ func (r *readinessManager) WaitReady(ctx context.Context, timeout time.Duration)
case <-ctx.Done():
return false
case <-time.After(timeout):
return true
return false
case <-r.done:
return true
}
Expand Down
Loading