Skip to content

OCPBUGS-6503: upgrade/adminack: simplify polling and unblock "guaranteed" post-upgrade check #27678

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
openshift-merge-robot merged 2 commits into from
Feb 2, 2023
Merged

OCPBUGS-6503: upgrade/adminack: simplify polling and unblock "guaranteed" post-upgrade check #27678

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1bd387
upgrade/adminack: simplify polling and unblock "guaranteed" post-upgr…
petr-muller Jan 23, 2023
c3184c4
upgrade/adminack: wait up to 4m until gate propagates to upgradeable
petr-muller Jan 24, 2023
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
16 changes: 8 additions & 8 deletions test/extended/util/openshift/clusterversionoperator/adminack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,19 +51,14 @@ func (t *AdminAckTest) Test(ctx context.Context) {
exercisedVersions := sets.NewString()
success := false
var lastError error
if err := wait.PollImmediateUntilWithContext(ctx, t.Poll, func(ctx context.Context) (bool, error) {
wait.UntilWithContext(ctx, func(ctx context.Context) {
if err := t.test(ctx, exercisedGates, exercisedVersions); err != nil {
framework.Logf("Retriable failure to evaluate admin acks: %v", err)
lastError = err
} else {
success = true
}
return false, nil
}); err == nil || err == wait.ErrWaitTimeout {
return
} else {
framework.Fail(err.Error())
}
}, t.Poll)

if !success {
framework.Failf("Never able to evaluate admin acks. Most recent failure: %v", lastError)
Expand Down Expand Up @@ -255,9 +250,14 @@ func setAdminGate(ctx context.Context, gateName string, gateValue string, oc *ex
return nil
}

// adminAckDeadline is the upper bound of time for CVO to notice a new adminack
// gate. CVO sync loop duration is nondeterministic 2-4m interval so we set this
// slightly above the worst case.
const adminAckDeadline = 4*time.Minute + 5*time.Second

func waitForAdminAckRequired(ctx context.Context, config *restclient.Config, message string) error {
framework.Logf("Waiting for Upgradeable to be AdminAckRequired for %q ...", message)
if err := wait.PollImmediate(10*time.Second, 3*time.Minute, func() (bool, error) {
if err := wait.PollImmediate(10*time.Second, adminAckDeadline, func() (bool, error) {
if adminAckRequiredWithMessage(ctx, config, message) {
return true, nil
}
Expand Down