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

Prevent pipeline from queueing large batches before an output is set #34741

Merged
merged 8 commits into from
Mar 9, 2023

Conversation

faec
Copy link
Contributor

@faec faec commented Mar 6, 2023

Two small changes to batch assembly in the pipeline:

  • in eventConsumer, don't start assembling batches until we get a non-nil output channel
  • in outputController, don't provide eventConsumer with a non-nil output channel if the output list is empty.

The first one prevents batches from being assembled while the output configuration is being updated. The second prevents batches from being assembled when running under Agent if we haven't yet received our output configuration. (When running under Agent, there is typically no output when pipeline.New is called, which previously allowed the construction of batches with no size limit before the output was really initialized.)

Fixes #34703.

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

@faec faec added bug Team:Elastic-Agent Label for the Agent team labels Mar 6, 2023
@faec faec self-assigned this Mar 6, 2023
@faec faec requested a review from a team as a code owner March 6, 2023 20:04
@faec faec requested review from rdner and leehinman and removed request for a team March 6, 2023 20:04
@elasticmachine
Copy link
Collaborator

Pinging @elastic/elastic-agent (Team:Elastic-Agent)

@botelastic botelastic bot added 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 Mar 6, 2023
@mergify
Copy link
Contributor

mergify bot commented Mar 6, 2023

This pull request does not have a backport label.
If this is a bug or security fix, could you label this PR @faec? 🙏.
For such, you'll need to label your PR with:

  • The upcoming major version of the Elastic Stack
  • The upcoming minor version of the Elastic Stack (if you're not pushing a breaking change)

To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-v8./d.0 is the label to automatically backport to the 8./d branch. /d is the digit

@elasticmachine
Copy link
Collaborator

elasticmachine commented Mar 6, 2023

💚 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-03-08T19:03:11.186+0000

  • Duration: 73 min 59 sec

Test stats 🧪

Test Results
Failed 0
Passed 25991
Skipped 1962
Total 27953

💚 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!)

Copy link
Member

@rdner rdner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need tests for the new behaviour.

@faec
Copy link
Contributor Author

faec commented Mar 7, 2023

Tests added for both checks. The eventConsumer case required some additional rearranging to make the relevant channel accessible from a test.

Copy link
Contributor

@leehinman leehinman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@faec faec merged commit 164d07b into elastic:main Mar 9, 2023
@faec faec deleted the batch-size-fix branch March 9, 2023 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Team:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Beats pipeline doesn't respect configured batch sizes on startup under agent
4 participants