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

Upgrade re2 from v1.17.7 to v1.20.1 #162880

Merged
merged 3 commits into from
Aug 4, 2023
Merged

Upgrade re2 from v1.17.7 to v1.20.1 #162880

merged 3 commits into from
Aug 4, 2023

Conversation

watson
Copy link
Contributor

@watson watson commented Aug 1, 2023 •
edited by kibanamachine

I was generating new re2 binaries to work with Node.js API version 115 (i.e. Node.js 20), so I thought I might as well bump the version used in main to the newest one while I was at it.

I've uploaded the relevant artifacts for both Node.js API version 115 and version 108 (i.e. Node.js 18) to a new folder named 1.20.1 in the yarn-prebuilt-artifacts bucket. So this should work both with the current Node.js 18 and also once we upgrade to Node.js 20 (in which case only the URL's and SHASUMs should be updated in src/dev/build/tasks/patch_native_modules_task.ts).

This PR also introduces scripts/download_re2.sh to make it easier to upgrade re2 in the future.

Tasks

Edit tasklist title
Beta Give feedback Tasklist Tasks, more options

Delete tasklist

Delete tasklist block?
Are you sure? All relationships in this tasklist will be removed.
  1. Ensure we update https://github.com/elastic/kibana-custom-nodejs-builds with relevant changes
    Options
  2. Check what we need to do regarding the custom Node.js build for Linux in regards to this new version of re2
    Options

@watson watson added 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 labels Aug 1, 2023
@watson watson self-assigned this Aug 1, 2023
@watson watson requested a review from a team as a code owner August 1, 2023 10:25
@elasticmachine
Copy link
Contributor

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

@watson watson mentioned this pull request Aug 3, 2023
Merged
@watson watson mentioned this pull request Aug 3, 2023
Merged
Ikuni17
Ikuni17 approved these changes Aug 3, 2023
View reviewed changes
Copy link
Contributor

@Ikuni17 Ikuni17 left a comment

Choose a reason for hiding this comment

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

Pulled and working. Just one quick question.

scripts/download_re2.sh
"win32-x64"
)
node_api_versions=( 108 115 )
formats=( "br" "gz" )
Copy link
Contributor

Choose a reason for hiding this comment

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

What is the br file used for? Wondering if we are using both.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was thinking the same thing. Both existed in bucket already, so I just did the same thing this time around. But I actually don't think we need it. Should I remove it in this PR or do y'all prefer that we do that at a later stage? I think there's a bunch of stuff regarding how we store these files that probably needs to be "cleaned up" now that we also have the custom build of Node.js and re2 in another bucket as well

Copy link
Contributor

Choose a reason for hiding this comment

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

I did a quick search for anything using br and didn't find anything. Maybe best to leave it for now and do a more thorough check in the clean up pass.

@Ikuni17
Copy link
Contributor

Ikuni17 commented Aug 3, 2023

Missed in review, sorry. Think we need to add .gz and .br to the .gitignore

@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

cc @watson

@watson watson merged commit 4c41247 into elastic:main Aug 4, 2023
21 checks passed
@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:
- [Ops] Bump Node.js to version 18 (#160289)
❌ 8.9 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 162880

Questions ?

Please refer to the Backport tool documentation

@watson watson deleted the bump-re2 branch August 4, 2023 20:31
@watson watson added auto-backport Deprecated: Automatically backport this PR after it's merged v7.17.13 and removed backport:all-open Backport to all branches that could still receive a release labels Aug 4, 2023
watson added a commit to watson/kibana that referenced this pull request Aug 4, 2023
@watson
Upgrade re2 from v1.17.7 to v1.20.1 (elastic#162880)
6959b34 
(cherry picked from commit 4c41247)

# Conflicts:
#	package.json
#	src/dev/build/tasks/patch_native_modules_task.ts
#	yarn.lock
@watson watson mentioned this pull request Aug 4, 2023
Closed
@watson
Copy link
Contributor Author

watson commented Aug 4, 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

@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:
- [Ops] Bump Node.js to version 18 (#160289)

Manual backport

To create the backport manually run:

node scripts/backport --pr 162880

Questions ?

Please refer to the Backport tool documentation and see the Github Action logs for details

@kibanamachine kibanamachine mentioned this pull request Aug 4, 2023
Merged
crespocarlos pushed a commit to crespocarlos/kibana that referenced this pull request Aug 8, 2023
@watson @crespocarlos
Upgrade re2 from v1.17.7 to v1.20.1 (elastic#162880)
054fe59
bryce-b pushed a commit to bryce-b/kibana that referenced this pull request Aug 9, 2023
@watson @bryce-b
Upgrade re2 from v1.17.7 to v1.20.1 (elastic#162880)
662bd91
This was referenced Aug 9, 2023
Merged
Merged
@jbudz jbudz mentioned this pull request Aug 22, 2023
Closed
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label May 12, 2024
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add the label auto-backport or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 162880 locally

1 similar comment
@kibanamachine
Copy link
Contributor

Friendly reminder: Looks like this PR hasn’t been backported yet.
To create automatically backports add the label auto-backport or prevent reminders by adding the backport:skip label.
You can also create backports manually by running node scripts/backport --pr 162880 locally

@azasypkin azasypkin removed backport missing Added to PRs automatically when the are determined to be missing a backport. auto-backport Deprecated: Automatically backport this PR after it's merged v7.17.13 labels May 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mistic mistic mistic left review comments

@Ikuni17 Ikuni17 Ikuni17 approved these changes

Assignees

@watson watson

Labels
release_note:skip Skip the PR/issue when compiling release notes Team:Operations Team label for Operations Team v8.10.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@watson @elasticmachine @Ikuni17 @kibana-ci @kibanamachine @mistic @azasypkin