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 #36076) Fix empty file edge case #36095

Merged
merged 3 commits into from
Jul 18, 2023
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 18, 2023

This is an automatic backport of pull request #36076 done by Mergify.
Cherry-pick of 0cd5775 has failed:

On branch mergify/bp/7.17/pr-36076
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit 0cd57755c1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   filebeat/input/filestream/fswatch.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   filebeat/input/filestream/fswatch_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


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

It's possible that file scanning happens when the file was created but
was not yet written to. In this case the size is 0.

We should not spawn any resources (e.g. harvesters) for such files until they actually
have some content. We create events only when read something from a
file, so having a harvester on an empty file is not useful.

Not handling this edge case also causes our tests to be flaky,
sometimes an expected size does not match an actual size (0).

(cherry picked from commit 0cd5775)

# Conflicts:
#	filebeat/input/filestream/fswatch_test.go
@mergify mergify bot requested a review from a team as a code owner July 18, 2023 08:07
@mergify mergify bot removed the request for review from a team July 18, 2023 08:07
@mergify mergify bot added the backport label Jul 18, 2023
@mergify mergify bot requested a review from ycombinator July 18, 2023 08:07
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 18, 2023
@mergify mergify bot requested a review from leehinman July 18, 2023 08:07
@mergify mergify bot assigned rdner Jul 18, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 18, 2023
@botelastic
Copy link

botelastic bot commented Jul 18, 2023

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jul 18, 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-07-18T11:16:29.061+0000

  • Duration: 39 min 23 sec

Test stats 🧪

Test Results
Failed 0
Passed 1011
Skipped 194
Total 1205

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

@rdner rdner enabled auto-merge (squash) July 18, 2023 08:43
@rdner
Copy link
Member

rdner commented Jul 18, 2023

/test filebeat-windows-windows-2019

@rdner rdner merged commit 195e58e into 7.17 Jul 18, 2023
@rdner rdner deleted the mergify/bp/7.17/pr-36076 branch July 18, 2023 11:56
rdner added a commit to rdner/beats that referenced this pull request Aug 12, 2023
In elastic#36065 a few fields were
renamed in order to clarify their purpose. Unfortunately, this rename
was a part of a new feature PR which was not supposed to be backported
to 7.17.

However, backporting some other changes related to this code
has now become challenging and results in build failures (note the
fixing commits):

- elastic#36095
- elastic#36264

This PR makes the naming consistent with the main branch, so we can
easily backport changes.
rdner added a commit that referenced this pull request Aug 12, 2023
In #36065 a few fields were
renamed in order to clarify their purpose. Unfortunately, this rename
was a part of a new feature PR which was not supposed to be backported
to 7.17.

However, backporting some other changes related to this code
has now become challenging and results in build failures (note the
fixing commits):

- #36095
- #36264

This PR makes the naming consistent with the main branch, so we can
easily backport changes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request 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