-
Notifications
You must be signed in to change notification settings - Fork 2.1k
ci-operator/templates/openshift: Refactor router-rollout wait (again) #2342
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.
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
ci-operator/templates/openshift: Refactor router-rollout wait (again) #2342
Conversation
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: crawford, wking 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 |
Today I saw [1]: error: watch closed before Until timeout error openshift-ingress/deploy/router-default did not come up sleep: invalid option -- '4' Try 'sleep --help' for more information. I suspect that the 'rollout status' request took long enough that the fresh 'date' call generated a time larger than wait_expiry_time. This commit rerolls the logic last touched by 7991fd3 (Fix how we wait on router rollout as the new cluster ingress operator, 2018-10-23, openshift#2004). Now we pick a total wait time (10 minutes), regardless of how many times we need to reconnect the watcher. With this commit, each watcher will try to wait for the full remaining period. So the first watcher tries to wait for 10 minutes. And if the first times out after 2 minutes, the second watcher will try to wait for 8 minutes. And the cool-off sleep is no longer parameterized, which removes the change of flaking like I saw today. [1]: https://storage.googleapis.com/origin-ci-test/pr-logs/pull/openshift_installer/688/pull-ci-openshift-installer-master-e2e-aws/1971/build-log.txt
|
@wking: Updated the following 3 configmaps:
DetailsIn response to this: Instructions 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. |
|
This has an error on rollout |
Fixing a typo from ac206e7 (ci-operator/templates/openshift: Refactor router-rollout wait (again), 2018-11-05, openshift#2342).
| NOW="$(date +%s)" | ||
| while [[ "${NOW}" -lt "${TARGET}" ]]; do | ||
| REMAINING="$((TARGET - NOW))" | ||
| if oc --request-timeout="${REMAINING}s" oc rollout status "${ROUTER_DEPLOYMENT}" -n "${ROUTER_NAMESPACE}" -w; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Drop the second oc
Catch up with ac206e7 (ci-operator/templates/openshift: Refactor router-rollout wait (again), 2018-11-05, openshift#2342) and ff16a01 (ci-operator/templates/openshift: Refactor router-rollout 'oc oc', 2018-12-09, openshift#2343).
installer bits of #2321, CC @crawford.