Skip to content

[7.13](backport #26260) Handle data returned with io.EOF in LineReader#26300

Merged
andrewkroh merged 3 commits into7.13from
mergify/bp/7.13/pr-26260
Jun 15, 2021
Merged

[7.13](backport #26260) Handle data returned with io.EOF in LineReader#26300
andrewkroh merged 3 commits into7.13from
mergify/bp/7.13/pr-26260

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jun 14, 2021

This is an automatic backport of pull request #26260 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.io/

The libbeat LineReader implementation did not handle the case where the underlying io.Reader
it was reading from returns bytes and io.EOF. It was discarding the data in this case.

As per the io.Reader contract:

    a Reader returning a non-zero number of bytes at the end of the input stream may return either err == EOF or err == nil.

This occurs often with the gzip.Reader. It returns a large chunk of data at the end of the file and io.EOF at the same time.

(cherry picked from commit 6896e77)
@mergify mergify bot added the backport label Jun 14, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jun 14, 2021
@botelastic
Copy link
Copy Markdown

botelastic bot commented Jun 14, 2021

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 14, 2021

💚 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

Expand to view the summary

Build stats

  • Build Cause: andrewkroh commented: run tests

  • Start Time: 2021-06-15T02:34:02.145+0000

  • Duration: 26 min 48 sec

  • Commit: 2c80ade

Test stats 🧪

Test Results
Failed 0
Passed 168
Skipped 0
Total 168

Trends 🧪

Image of Build Times

Image of Tests

💚 Flaky test report

Tests succeeded.

Expand to view the summary

Test stats 🧪

Test Results
Failed 0
Passed 168
Skipped 0
Total 168

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Jun 14, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.13/pr-26260 upstream/mergify/bp/7.13/pr-26260
git merge upstream/7.13
git push upstream mergify/bp/7.13/pr-26260

@andrewkroh
Copy link
Copy Markdown
Member

run tests

@andrewkroh andrewkroh merged commit f28af6f into 7.13 Jun 15, 2021
@mergify mergify bot deleted the mergify/bp/7.13/pr-26260 branch June 15, 2021 12:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants