Retry enrollment requests when an error is returned, add enrollment timeout #8056
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
michel-laterman added bug 
Contributor
| Pinging @elastic/elastic-agent-control-plane (Team:Elastic-Agent-Control-Plane) |
blakerouse requested changes May 1, 2025
changelog/fragments/1746113477-Retry-enrollment-for-all-errors.yaml Outdated Show resolved Hide resolved
blakerouse requested changes May 1, 2025
michel-laterman changed the title michel-laterman changed the title michel-laterman added enhancement 
ycombinator reviewed May 5, 2025
ycombinator reviewed May 5, 2025
ycombinator reviewed May 5, 2025
swiatekm reviewed May 6, 2025
Contributor
swiatekm left a comment
swiatekm left a comment There was a problem hiding this comment.
Could you resolve the lint failures? Otherwise the changes look good to me, although I'd feel more comfortable with an added test or two.
ycombinator reviewed May 7, 2025
blakerouse previously approved these changes May 7, 2025
Contributor
blakerouse left a comment
blakerouse left a comment There was a problem hiding this comment.
This change itself now looks good. I am happy with how this turned out.
swiatekm previously approved these changes May 7, 2025
Contributor
swiatekm left a comment
swiatekm left a comment There was a problem hiding this comment.
Looks good. We should address cancellation for the backoff in a follow-up though.
Contributor Author
| Made #8105 to track context cancelations |
swiatekm approved these changes May 7, 2025
|
Contributor
💛 Build succeeded, but was flaky
Failed CI StepsHistory
|
3 tasks
michel-laterman added a commit that referenced this pull request May 7, 2025
…imeout (#8056) (#8108) Retry enrollment requests when an error is returned until a timeout is reached. Add --enroll-timeout and FLEET_ENROLL_TIMEOUT to control how long the timeout is; default 10m. A negative value disables the timeout. (cherry picked from commit b201e16) Co-authored-by: Michel Laterman <82832767+michel-laterman@users.noreply.github.com>
v1v added a commit to v1v/elastic-agent that referenced this pull request May 8, 2025
* upstream/main: Guard against `nil` pointer dereference (elastic#8107) Generate NOTICE.txt with only modules used by binaries (elastic#8053) Retry enrollment requests when an error is returned, add enrollment timeout (elastic#8056) Changelog for 8.17.6 version (elastic#8062) (elastic#8106) [main][Automation] Update versions (elastic#8098) Allow using beats receivers for self-monitoring (elastic#8031) Adding new configuration setting: `agent.upgrade.rollback.window` (elastic#8065) [Integration Testing] Allow tests to declare themselves as needing a FIPS environment (elastic#8083) fix(agentless): overcome SIGPIPE in agentless promotion pipeline (elastic#8094) ksm autosharing integration configuration update (elastic#8086)
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.
What does this PR do?
Retry enrollment requests when an error is returned until a timeout is reached.
Add
--enroll-timeoutandFLEET_ENROLL_TIMEOUTto control how long the timeout is; default 10m.Why is it important?
Increase reliability of enrollments.
Checklist
I have commented my code, particularly in hard-to-understand areasI have made corresponding changes to the documentationI have made corresponding change to the default configuration filesI have added tests that prove my fix is effective or that my feature works./changelog/fragmentsusing the changelog toolI have added an integration test or an E2E testDisruptive User Impact
Agents running via container, or command line without the delay enrollment option will retry for 10m instead of indefinitely.