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

[7.17](backport #31268) Detect new files under known paths in filestream input #31275

Merged
merged 1 commit into from
Apr 13, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 13, 2022

This is an automatic backport of pull request #31268 done by Mergify.
Cherry-pick of 54997ac

@mergify mergify bot requested a review from a team as a code owner April 13, 2022 07:50
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Apr 13, 2022
@mergify mergify bot assigned kvch Apr 13, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 13, 2022
@botelastic
Copy link

botelastic bot commented Apr 13, 2022

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Apr 13, 2022

💚 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: 2022-04-13T09:54:32.568+0000

  • Duration: 78 min 2 sec

Test stats 🧪

Test Results
Failed 0
Passed 7043
Skipped 681
Total 7724

💚 Flaky test report

Tests succeeded.

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

This PR fixes the `FileWatcher` of `filestream` input. Now a file is considered new even if the scanner has already found it in the previous iteration and the underlying file is different.

In the PR the file comparator function is passed as a parameter to make unit testing easier.

The problem is if an input file is renamed and a new file shows up, Filebeat did not register is as a new file. The new file was either considered updated. Or if the new file was smaller than the previous file, the file was deemed truncated and the complete contents of the previous file was reread from the beginning.

(cherry picked from commit 54997ac)
@kvch kvch force-pushed the mergify/bp/7.17/pr-31268 branch from 5011db8 to 16548e8 Compare April 13, 2022 09:54
@kvch kvch removed the conflicts There is a conflict in the backported pull request label Apr 13, 2022
@kvch kvch merged commit 3034e2e into 7.17 Apr 13, 2022
@mergify mergify bot deleted the mergify/bp/7.17/pr-31268 branch April 13, 2022 11:14
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