Skip to content
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

[8.8](backport #35250) Fix input reload under Elastic-Agent #35641

Merged
merged 1 commit into from
Jun 2, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 1, 2023

This is an automatic backport of pull request #35250 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

…5250)

This commit addresses the input reload issue in Elastic-Agent by introducing an infinite retry logic in the ManagerV2. The implemented logic mirrors the configuration reload behavior of a standalone Beat.

When reloading inputs, if there is at least one occurrence of 'common.ErrInputNotFinished', the 'forceReload' flag is set to true, and the debounce timer is initiated. This process will repeat until no 'common.ErrInputNotFinished' error is encountered.

Additionally, the 'changeDebounce' period is extended to 1 second, and the 'forceReloadDebounce' period is set to 10 times the 'changeDebounce' value.

---------

Co-authored-by: Blake Rouse <[email protected]>
Co-authored-by: Anderson Queiroz <[email protected]>
Co-authored-by: Denis <[email protected]>
(cherry picked from commit 137bc81)
@mergify mergify bot requested a review from a team as a code owner June 1, 2023 14:47
@mergify mergify bot removed the request for review from a team June 1, 2023 14:47
@mergify mergify bot added the backport label Jun 1, 2023
@mergify mergify bot requested review from belimawr and fearful-symmetry June 1, 2023 14:47
@botelastic botelastic bot added Team:Automation Label for the Observability productivity team needs_team Indicates that the issue/PR needs a Team:* label and removed needs_team Indicates that the issue/PR needs a Team:* label labels Jun 1, 2023
@elasticmachine
Copy link
Collaborator

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2023-06-01T14:47:31.350+0000

  • Duration: 98 min 59 sec

Test stats 🧪

Test Results
Failed 0
Passed 26349
Skipped 1975
Total 28324

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

Expand to view the GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@pierrehilbert
Copy link
Collaborator

@belimawr could we merge this one please?

@belimawr belimawr merged commit 2dbbae4 into 8.8 Jun 2, 2023
@belimawr belimawr deleted the mergify/bp/8.8/pr-35250 branch June 2, 2023 09:51
@reakaleek reakaleek mentioned this pull request Jul 19, 2023
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants