Reduce default status wait timeout #575
Merged
Conversation
This file contains 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
This was introduced in commit 8c6b059 ("clustermesh: Extend status command with connectivity status") but never used. Signed-off-by: Tobias Klauser <[email protected]>
Use the existing defaults.WaitRetryInterval (2 seconds) instead of locally duplicating it. Signed-off-by: Tobias Klauser <[email protected]>
gandro
approved these changes
Oct 7, 2021
…naged pods In case the `--wait` option is set, we already wait for Cilium to become ready. Re-use that status check for the case where this is needed before restarting unmanaged pods. Note that this will also wait for the operator to become ready, which wasn't the case previously when invoked with `--wait=false --restart-unmanaged-pods=true`. As Sebastian points out however, the agent will likely implicitly wait for the operator to become ready before becoming ready itself. Signed-off-by: Tobias Klauser <[email protected]>
Unify the maximum duration to wait for status in a single constant and use it across the commands. This is in preparation for adjusting the wait duration. Signed-off-by: Tobias Klauser <[email protected]>
Checking recent CI runs [1], `cilium install` and `cilium hubble enable` both took no longer than ~1min. As suggested by Joe [2], reduce the default status timeout to 5 minutes which should still be plenty for the normal case and if something gets stuck e.g. in CI we're not randomly waiting 15 minutes until eventually timing out. [1] https://github.com/cilium/cilium-cli/actions?query=branch%3Amaster+event%3Aschedule++ [2] #564 (comment) Suggested-by: Joe Stringer <[email protected]> Signed-off-by: Tobias Klauser <[email protected]>
tklauser
force-pushed
the
pr/tklauser/wait-timeout-reduce
branch
from
a0ca958 to
365b165
Compare
joestringer
approved these changes
Oct 7, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
First two commits are cleanup/refactoring.
The third commit fixes the Cilium status check before restarting unmanaged pods and also avoids checking the status again in case
--wait (this is the default)was specified and Cilium is known to be ready.Commits four and five unify and reduce the default timeout for the status wait operations, following up on review comments in #564 (comment)
See individual commit messages for details.