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 #36256) Filter out duplicate paths resolved from matching globs #36264

Merged
merged 3 commits into from
Aug 8, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 8, 2023

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

Filter out duplicate paths resolved from matching globs

Multiple globs can resolve in duplicate filenames. These duplicates
must be filtered out even before they reach the creation of file descriptors
and additional checks, otherwise this causes a flood of warning
messages in logs.

These warnings should catch only the cases when symlinks are
resolved in known filenames.

(cherry picked from commit 4d0276a)
@mergify mergify bot requested a review from a team as a code owner August 8, 2023 16:35
@mergify mergify bot added the backport label Aug 8, 2023
@mergify mergify bot requested review from belimawr and rdner and removed request for a team August 8, 2023 16:35
@mergify mergify bot assigned rdner Aug 8, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Aug 8, 2023
@botelastic
Copy link

botelastic bot commented Aug 8, 2023

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

@rdner rdner enabled auto-merge (squash) August 8, 2023 16:39
@elasticmachine
Copy link
Collaborator

elasticmachine commented Aug 8, 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-08-08T18:48:54.989+0000

  • Duration: 66 min 38 sec

Test stats 🧪

Test Results
Failed 0
Passed 6332
Skipped 533
Total 6865

💚 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 merged commit 8b932df into 7.17 Aug 8, 2023
8 checks passed
@rdner rdner deleted the mergify/bp/7.17/pr-36256 branch August 8, 2023 19:54
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 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