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

revert grpc breaking netty tls change #200

Merged

Conversation

pjfanning
Copy link
Contributor

see #197 and #199

the akka-grpc 2.1.6 breakage was traced back to this OSS akka-grpc 2.1.6 change (akka/akka-grpc#1649) and reverted here

@pjfanning
Copy link
Contributor Author

adding @mkurz too

Since we are now in license hell due to #197, I think the best starting place is to revert the original change that caused the issue (that was made before Pekko forked and we are safe to reference that change since it is an OSS friendly chane).

We can build on top of this but this might a starting point.

Comment on lines +202 to +204
nettySslContextField.set(nettySslContext, javaSslContext)

nettySslContext
Copy link
Member

Choose a reason for hiding this comment

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

so this is leveraging the netty and based on a special impl too, future netty can do some kind of refactoring, and then this will fail again.

Copy link
Contributor Author

@pjfanning pjfanning Dec 25, 2023

Choose a reason for hiding this comment

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

it will work for now and we can build a new fix - code is a living thing, today's fixes can be improved later on

we have broken code today and #197 makes it hard for us to do a better fix than this in the short term

this change gets us back to the working code in akka-grpc 2.1.5

Copy link
Member

Choose a reason for hiding this comment

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

Nice find, I have not check it:) maybe someone will do some tweets on X then.
And for the fix, I think that should not be hard. the tests suit maybe a little complex which need some keys setup.
Before we come up a fix, we should provide a test about it first.

Copy link
Member

Choose a reason for hiding this comment

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

Another issue is, can't we just do a quick reset and git push -f to drop that commit?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Another issue is, can't we just do a quick reset and git push -f to drop that commit?

I'm sure if removing the #197 commit from git history is required but if it the consensus is to try to hide it altogether, we can go that way.

Copy link
Member

Choose a reason for hiding this comment

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

We should just drop it completly I think, otherwise the result commit log contains incompatible code.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The thing is that the git branch is protected - it will need to be unprotected to allow commits to be removed. Anyone who has a local git branch with the commit would also need to clean their set up afterwards. So forcing a removal of the commit is pretty drastic. It is not clear that it is absolutely needed.

Copy link
Member

Choose a reason for hiding this comment

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

I know, but more safer way I think.

Copy link
Contributor

Choose a reason for hiding this comment

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

I am against unprotecting the git branch, it may have been acceptable right at the time of forking pekko but at this point there are way too many people that have this git branch checked out and over-writing the main branch basically forces everyone who has git cloned this repo to re-pull the changes, so even if we do remove the commit from main unless people wipe their repo they will still have the commit.

Thing is, I don't know what the ASF policy on this is, if I had a say in this I would add the commit (and the revert commit) to .git-ignore-blame-revs so that its more hidden but realistically I don't know what more can be done.

Copy link
Member

@He-Pin He-Pin left a comment

Choose a reason for hiding this comment

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

lgtm

@pjfanning pjfanning merged commit 513a1c3 into apache:main Dec 26, 2023
15 of 16 checks passed
@pjfanning pjfanning deleted the revert-grpc-breaking-netty-tls-change branch December 26, 2023 08:15
@pjfanning pjfanning added this to the v1.0.1 milestone Dec 26, 2023
@pjfanning
Copy link
Contributor Author

this seems to fix the play-grpc issue - playframework/play-grpc#468 (comment)

@mkurz
Copy link

mkurz commented Jan 9, 2024

Thanks for fixing this over the holidays! I see you just released v1.0.2, so I released play-grpc 0.12.1 as well:

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