Inefficient wait for all clusteroperators #7535
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
/retest |
Contributor
|
/test e2e-vsphere-ovn |
r4f4
reviewed
Sep 28, 2023
Contributor
r4f4
left a comment
r4f4
left a comment
There was a problem hiding this comment.
Suggested some changes to use the new set syntax (using Go generics). Other than that, I think I prefer this version since it's much easier to understand and maintain.
I don't think the "inefficiency" is an issue since all we're doing is to wait for the operators anyway.
cmd/openshift-install/create.go
Outdated
Contributor
There was a problem hiding this comment.
Suggested change
| logrus.Debug("These cluster operators were stable: [%s]", strings.Join(stableOperators.List(), ", ")) | |
| logrus.Debugf("These cluster operators were stable: [%s]", strings.Join(sets.List(stableOperators), ", ")) |
cmd/openshift-install/create.go
Outdated
Contributor
There was a problem hiding this comment.
Suggested change
| previouslyStableOperators := sets.String{} | |
| previouslyStableOperators := sets.New[string]() |
cmd/openshift-install/create.go
Outdated
Contributor
There was a problem hiding this comment.
Suggested change
| func currentOperatorStability(clusterOperatorLister configlisters.ClusterOperatorLister) (sets.String, sets.String, error) { | |
| func currentOperatorStability(clusterOperatorLister configlisters.ClusterOperatorLister) (sets.Set[string], sets.Set[string], error) { |
cmd/openshift-install/create.go
Outdated
Comment on lines
757
to
758
Contributor
There was a problem hiding this comment.
Suggested change
| stableOperators := sets.String{} | |
| unstableOperators := sets.String{} | |
| stableOperators := sets.New[string]() | |
| unstableOperators := sets.New[string]() |
cmd/openshift-install/create.go
Outdated
Contributor
There was a problem hiding this comment.
Suggested change
| for _, name := range newlyStableOperators.List() { | |
| for _, name := range sets.List(newlyStableOperators) { |
cmd/openshift-install/create.go
Outdated
Contributor
There was a problem hiding this comment.
Suggested change
| for _, name := range newlyUnstableOperators.List() { | |
| for _, name := range sets.List(newlyUnstableOperators) { |
cmd/openshift-install/create.go
Outdated
Contributor
There was a problem hiding this comment.
Suggested change
| logrus.Errorf("These cluster operators were not stable: [%s]", strings.Join(unstableOperators.List(), ", ")) | |
| logrus.Errorf("These cluster operators were not stable: [%s]", strings.Join(sets.List(unstableOperators), ", ")) |
Contributor
Author
|
the generic set doesn't have an ordered |
Contributor
Author
I see. Very nice. Didn't know that was a thing |
deads2k
force-pushed
the
inefficient
branch
from
6893f22 to
8d25977
Compare
Closed
Contributor
|
/test e2e-vsphere-ovn |
Contributor
|
/cc @patrickdillon |
Contributor
|
I'm waiting for the CI results to stamp it, but LGTM. |
Closed
Contributor
|
With a deadline of 1 minute for all operators to reach stable in #7538, we can see the output in case of failure /lgtm |
Contributor
|
/payload 4.15 nightly informing |
Contributor
|
@r4f4: trigger 62 job(s) of type informing for the nightly release of OCP 4.15
See details on https://pr-payload-tests.ci.openshift.org/runs/ci/a27c9130-5f02-11ee-9880-d88f52ff8b23-0 |
openshift-merge-robot
added
the
needs-rebase
This reverts commit 017b4f0.
openshift-merge-robot
removed
the
needs-rebase
|
|
||
| // waitForStableOperators ensures that each cluster operator is "stable", i.e. the | ||
| // operator has not been in a progressing state for at least a certain duration, | ||
| // 30 seconds by default. Returns an error if any operator does meet this threshold |
Contributor
There was a problem hiding this comment.
Suggested change
| // 30 seconds by default. Returns an error if any operator does meet this threshold | |
| // 30 seconds by default. Returns an error if any operator does not meet this threshold |
right?
Contributor
|
/approve |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: patrickdillon The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
Contributor
Contributor
|
@deads2k: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
Contributor
Contributor
Contributor
|
/hold Revision 94c54e0 was retested 3 times: holding |
openshift-ci
bot
added
the
do-not-merge/hold
Contributor
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
Contributor
Contributor
|
/test okd-scos-images |
Contributor
|
@deads2k: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
Contributor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
while looking at #7525 and weighing code complexity versus efficient, this may be worth the inefficiency for understandability. It's an option, not a requirement and I do recognize that it's closer to the original than the efficient.