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

Netty upgrade to 4.1.110 in grpc-java #11273

Merged
merged 12 commits into from
Aug 2, 2024

Conversation

kannanjgithub
Copy link
Contributor

Netty upgrade to 4.1.110 in grpc-java
Issue #11150

Copy link
Member

@ejona86 ejona86 left a comment

Choose a reason for hiding this comment

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

MODULE.bazel also needs updating. That is why the Bazel test is failing.

SECURITY.md Outdated Show resolved Hide resolved
@kannanjgithub
Copy link
Contributor Author

MODULE.bazel also needs updating. That is why the Bazel test is failing.

Done.

@XN137
Copy link

XN137 commented Jun 12, 2024

justFYI: 4.1.111.Final would be out https://netty.io/news/2024/06/11/4-1-111-Final.html

@lhotari
Copy link

lhotari commented Jun 13, 2024

justFYI: 4.1.111.Final would be out https://netty.io/news/2024/06/11/4-1-111-Final.html

I reported #11284 about 4.1.111.Final. It would be useful to run CI with it to see what breaks.

@ejona86 ejona86 mentioned this pull request Aug 2, 2024
@kannanjgithub
Copy link
Contributor Author

@ejona86 Windows test is timing out. Any idea about this test?

@ejona86
Copy link
Member

ejona86 commented Aug 2, 2024

It can flake. Follow the link to Test Fusion and click the "rebuild" button.

@kannanjgithub kannanjgithub merged commit f9b072c into grpc:master Aug 2, 2024
13 checks passed
@kannanjgithub kannanjgithub deleted the netty-upgrade branch August 2, 2024 19:35
@ejona86 ejona86 added the TODO:backport PR needs to be backported. Removed after backport complete label Aug 2, 2024
@ejona86
Copy link
Member

ejona86 commented Aug 2, 2024

This needs to be backported to the 1.66 branch. Easiest way is to use https://gist.github.com/sergiitk/af606cbab72b00d8db8a53d21e766ee9 (./backport.sh grpc-java 11273 66). It does some niceties like adding "(v1.66.x backport)" to the PR description, adding a reference back to the original PR so you can see the list of all backports in one location. But it is also essentially just a cherry-pick onto a branch, so isn't mandatory.

ejona86 added a commit to ejona86/grpc-java that referenced this pull request Aug 2, 2024
This reverts commit f9b072c.

Changes from the release process got mixed in with the commit.
@ejona86
Copy link
Member

ejona86 commented Aug 2, 2024

Reverting in #11440

ejona86 added a commit that referenced this pull request Aug 2, 2024
This reverts commit f9b072c.

Changes from the release process got mixed in with the commit.
@kannanjgithub
Copy link
Contributor Author

kannanjgithub commented Aug 3, 2024

Once I noticed there were unintended commits that caused test failure I panic reverted them but I didn't notice there were more commits to revert (there were 4 but I only noticed 2) so my revert left things in a half baked state.

I had thought once certain changes are committed to a branch https://screenshot.googleplex.com/86pkpKBjbbagzvR they belong to that branch. But what is happening is that they get carried over when I switch branch and get committed again with a different hash. I don't really understand how this works. I know commits carry over if I do checkout -b but I only checked out an existing branch in this case. @ejona86

@ejona86
Copy link
Member

ejona86 commented Aug 5, 2024

Commits stay on branches, but certain operations can copy commits between branches, like rebase and merge. I could probably look at your bash history to figure out how it happened. It does seem like it is happening very frequently for you.

@kannanjgithub kannanjgithub restored the netty-upgrade branch August 5, 2024 18:11
@kannanjgithub kannanjgithub deleted the netty-upgrade branch August 6, 2024 10:02
@kannanjgithub kannanjgithub removed the TODO:backport PR needs to be backported. Removed after backport complete label Aug 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants