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 #33956) filestream: fix 'requires pointer' error #34041

Merged
merged 6 commits into from
Dec 20, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 14, 2022

This is an automatic backport of pull request #33956 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

This commit fixes the 'requires pointer' error log issued by
filestream when a file being harvested is renamed.

Filebeat already recovers from this error by using the file
identifier from the prospector instead of the metadata, so the log
message is downgraded to warn and contains more details about what
happened.

(cherry picked from commit 2263f3e)
@mergify mergify bot requested a review from a team as a code owner December 14, 2022 11:50
@mergify mergify bot requested review from rdner and faec and removed request for a team December 14, 2022 11:50
@mergify mergify bot added the backport label Dec 14, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Dec 14, 2022
@botelastic
Copy link

botelastic bot commented Dec 14, 2022

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

@elasticmachine
Copy link
Collaborator

elasticmachine commented Dec 14, 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-12-15T14:36:11.815+0000

  • Duration: 67 min 13 sec

Test stats 🧪

Test Results
Failed 0
Passed 7070
Skipped 681
Total 7751

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

@mergify
Copy link
Contributor Author

mergify bot commented Dec 14, 2022

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.17/pr-33956 upstream/mergify/bp/7.17/pr-33956
git merge upstream/7.17
git push upstream mergify/bp/7.17/pr-33956

@mergify
Copy link
Contributor Author

mergify bot commented Dec 15, 2022

This pull request has not been merged yet. Could you please review and merge it @belimawr? 🙏

@rdner
Copy link
Member

rdner commented Dec 15, 2022

@belimawr could you have a look at failed tests?

@belimawr belimawr self-requested a review December 15, 2022 10:16
@sonarqubecloud
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@mergify
Copy link
Contributor Author

mergify bot commented Dec 16, 2022

This pull request has not been merged yet. Could you please review and merge it @belimawr? 🙏

@rdner
Copy link
Member

rdner commented Dec 16, 2022

@belimawr why did we need to make this change?

91d3180

It was not a part of the original PR and the main branch still has it unchanged

p := fileProspector{
filewatcher: newMockFileWatcher(tc.events, len(tc.events)),
identifier: mustPathIdentifier(true),
stateChangeCloser: stateChangeCloserConfig{Renamed: true},
}

I find this change suspicious 🙂

@mergify
Copy link
Contributor Author

mergify bot commented Dec 20, 2022

This pull request has not been merged yet. Could you please review and merge it @belimawr? 🙏

@belimawr
Copy link
Contributor

@belimawr why did we need to make this change?

91d3180

It was not a part of the original PR and the main branch still has it unchanged

p := fileProspector{
filewatcher: newMockFileWatcher(tc.events, len(tc.events)),
identifier: mustPathIdentifier(true),
stateChangeCloser: stateChangeCloserConfig{Renamed: true},
}

I find this change suspicious slightly_smiling_face

newMockFileWatcher does not exist on 7.17 branch. There are more tests and more helper functions on main. I just took the easiest route to make the tests pass on 7.17, with is also the one with less changes.

@belimawr belimawr merged commit 8f33651 into 7.17 Dec 20, 2022
@belimawr belimawr deleted the mergify/bp/7.17/pr-33956 branch December 20, 2022 07:16
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.

3 participants