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.

Sign up for GitHub

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

Jump to bottom

fix(NA): apply ipv4 first dns result order for worker threads #163484

Merged
merged 3 commits into from
Aug 9, 2023
Merged

fix(NA): apply ipv4 first dns result order for worker threads #163484

merged 3 commits into from
Aug 9, 2023

Conversation

mistic
Copy link
Member

@mistic mistic commented Aug 9, 2023 •
edited by kibanamachine
Loading

This PR is a follow up of #163025 as we discover the initial fix doesn't apply correctly to working threads during development.

@mistic mistic added chore Team:Operations Team label for Operations Team release_note:skip Skip the PR/issue when compiling release notes backport:all-open Backport to all branches that could still receive a release v8.10.0 labels Aug 9, 2023
@mistic mistic marked this pull request as ready for review August 9, 2023 12:15
@mistic mistic requested a review from a team as a code owner August 9, 2023 12:15
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-operations (Team:Operations)

@mistic mistic requested a review from jbudz August 9, 2023 12:46
tomsonpl
tomsonpl approved these changes Aug 9, 2023
View reviewed changes
Copy link
Contributor

@tomsonpl tomsonpl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for doing this 👍

@mistic mistic added release_note:skip Skip the PR/issue when compiling release notes and removed release_note:skip Skip the PR/issue when compiling release notes labels Aug 9, 2023
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@mistic mistic merged commit f4856f7 into elastic:main Aug 9, 2023
@mistic mistic mentioned this pull request Aug 9, 2023
Closed
@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
❌ 7.17 Backport failed because of merge conflicts

You might need to backport the following PRs to 7.17:
- [node] Restore default Node.js 16 DNS lookup behavior (#163025)
❌ 8.9 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 163484

Questions ?

Please refer to the Backport tool documentation

@mistic mistic mentioned this pull request Aug 9, 2023
Merged
@mistic
Copy link
Member Author

mistic commented Aug 9, 2023

💚 All backports created successfully

Status Branch Result
✅ 8.9

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

mistic added a commit to mistic/kibana that referenced this pull request Aug 9, 2023
@mistic
fix(NA): apply ipv4 first dns result order for worker threads (elasti…
44eb6ae 
…c#163484)

This PR is a follow up of elastic#163025
as we discover the initial fix doesn't apply correctly to working
threads during development.

(cherry picked from commit f4856f7)

# Conflicts:
#	src/setup_node_env/index.js
mistic added a commit to mistic/kibana that referenced this pull request Aug 9, 2023
@mistic
fix(NA): apply ipv4 first dns result order for worker threads (elasti…
644cd39 
…c#163484)

This PR is a follow up of elastic#163025
as we discover the initial fix doesn't apply correctly to working
threads during development.

(cherry picked from commit f4856f7)

# Conflicts:
#	src/setup_node_env/index.js
@mistic mistic mentioned this pull request Aug 9, 2023
Merged
@mistic
Copy link
Member Author

mistic commented Aug 9, 2023

💚 All backports created successfully

Status Branch Result
✅ 7.17

Note: Successful backport PRs will be merged automatically after passing CI.

Questions ?

Please refer to the Backport tool documentation

bryce-b pushed a commit to bryce-b/kibana that referenced this pull request Aug 9, 2023
@mistic @bryce-b
fix(NA): apply ipv4 first dns result order for worker threads (elasti…
f7d3caf 
…c#163484)

This PR is a follow up of elastic#163025
as we discover the initial fix doesn't apply correctly to working
threads during development.
mistic added a commit that referenced this pull request Aug 9, 2023
@mistic
[8.9] fix(NA): apply ipv4 first dns result order for worker threads (#…
d781e42 
…163484) (#163512)

# Backport

This will backport the following commits from `main` to `8.9`:
- [fix(NA): apply ipv4 first dns result order for worker threads
(#163484)](#163484)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Tiago
Costa","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-08-09T15:49:57Z","message":"fix(NA):
apply ipv4 first dns result order for worker threads (#163484)\n\nThis
PR is a follow up of https://github.com/elastic/kibana/pull/163025\r\nas
we discover the initial fix doesn't apply correctly to
working\r\nthreads during
development.","sha":"f4856f74784cf5ca2094f2f54a6d86f2aff3335a","branchLabelMapping":{"^v8.10.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Operations","release_note:skip","backport:all-open","v8.10.0"],"number":163484,"url":"https://github.com/elastic/kibana/pull/163484","mergeCommit":{"message":"fix(NA):
apply ipv4 first dns result order for worker threads (#163484)\n\nThis
PR is a follow up of https://github.com/elastic/kibana/pull/163025\r\nas
we discover the initial fix doesn't apply correctly to
working\r\nthreads during
development.","sha":"f4856f74784cf5ca2094f2f54a6d86f2aff3335a"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.10.0","labelRegex":"^v8.10.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/163484","number":163484,"mergeCommit":{"message":"fix(NA):
apply ipv4 first dns result order for worker threads (#163484)\n\nThis
PR is a follow up of https://github.com/elastic/kibana/pull/163025\r\nas
we discover the initial fix doesn't apply correctly to
working\r\nthreads during
development.","sha":"f4856f74784cf5ca2094f2f54a6d86f2aff3335a"}}]}]
BACKPORT-->
mistic added a commit that referenced this pull request Aug 9, 2023
@mistic
[7.17] fix(NA): apply ipv4 first dns result order for worker threads (#…
736849e 
…163484) (#163513)

# Backport

This will backport the following commits from `main` to `7.17`:
- [fix(NA): apply ipv4 first dns result order for worker threads
(#163484)](#163484)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Tiago
Costa","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-08-09T15:49:57Z","message":"fix(NA):
apply ipv4 first dns result order for worker threads (#163484)\n\nThis
PR is a follow up of https://github.com/elastic/kibana/pull/163025\r\nas
we discover the initial fix doesn't apply correctly to
working\r\nthreads during
development.","sha":"f4856f74784cf5ca2094f2f54a6d86f2aff3335a","branchLabelMapping":{"^v8.10.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Operations","release_note:skip","backport:all-open","v8.10.0"],"number":163484,"url":"https://github.com/elastic/kibana/pull/163484","mergeCommit":{"message":"fix(NA):
apply ipv4 first dns result order for worker threads (#163484)\n\nThis
PR is a follow up of https://github.com/elastic/kibana/pull/163025\r\nas
we discover the initial fix doesn't apply correctly to
working\r\nthreads during
development.","sha":"f4856f74784cf5ca2094f2f54a6d86f2aff3335a"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v8.10.0","labelRegex":"^v8.10.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/163484","number":163484,"mergeCommit":{"message":"fix(NA):
apply ipv4 first dns result order for worker threads (#163484)\n\nThis
PR is a follow up of https://github.com/elastic/kibana/pull/163025\r\nas
we discover the initial fix doesn't apply correctly to
working\r\nthreads during
development.","sha":"f4856f74784cf5ca2094f2f54a6d86f2aff3335a"}},{"url":"https://github.com/elastic/kibana/pull/163512","number":163512,"branch":"8.9","state":"OPEN"}]}]
BACKPORT-->
@mistic mistic self-assigned this Aug 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tomsonpl tomsonpl tomsonpl approved these changes

@jbudz jbudz jbudz approved these changes

Assignees

@mistic mistic

Labels
backport:all-open Backport to all branches that could still receive a release chore release_note:skip Skip the PR/issue when compiling release notes Team:Operations Team label for Operations Team v7.17.13 v8.9.1 v8.10.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@mistic @elasticmachine @kibana-ci @kibanamachine @jbudz @tomsonpl