[Ingest Manager] Fix agent tests and short polling timeout#79442
Merged
nchaulet merged 2 commits intoelastic:masterfrom Oct 5, 2020
Merged
[Ingest Manager] Fix agent tests and short polling timeout#79442nchaulet merged 2 commits intoelastic:masterfrom
nchaulet merged 2 commits intoelastic:masterfrom
Conversation
Contributor
|
Pinging @elastic/ingest-management (Team:Ingest Management) |
Contributor
|
@elasticmachine merge upstream |
jen-huang
approved these changes
Oct 5, 2020
Contributor
jen-huang
left a comment
There was a problem hiding this comment.
Ran the single test locally and it passes. Thanks for fixing!
Contributor
💚 Build SucceededMetrics [docs]
History
To update your PR or re-run it, just comment with: |
nchaulet
added a commit
to nchaulet/kibana
that referenced
this pull request
Oct 5, 2020
nchaulet
added a commit
that referenced
this pull request
Oct 5, 2020
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Summary
Resolve #75241
I introduced a margin of 20s when we set the timeout for the agent checkin long polling call, this is not working if the timeout is configured with a value lower than 20s, and this is the case for the tests.
This PR fix it by removing the socket timeout, and not applying the margin if the long polling duration is lower than 20s.