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

Fix in "upstream" not "synced" to this repo #22

Open
walro opened this issue Oct 26, 2020 · 2 comments
Open

Fix in "upstream" not "synced" to this repo #22

walro opened this issue Oct 26, 2020 · 2 comments

Comments

@walro
Copy link

walro commented Oct 26, 2020

We recently switched over to using your fork rather than the original version, as a result of that I checked the difference between original/"upstream" and this fork, using: master...shyiko:master

It appears that the fix for shyiko#321 is not included in this repo, as it was commited after "time-of-fork". In particular it's the following two commits that could potentially be of use here too: shyiko/mysql-binlog-connector-java@0.20.1...c54b4c1

Cherry-picking the first commit, e59006e, worked without any hassle. Things got a bit hairy when trying to apply c54b4c1 as lines in the same file were touched later on.

I will try to put up a PR, but preemptively created this issue in case I fail :-)

Thanks for keeping the project alive!

@osheroff
Copy link
Owner

ugh, yeah. c54b4c1 has a lot of refactoring / unrelated changes that are deeply in conflict. do you think we could find a more surgical fix for whatever the deadlock issue there was?

@walro
Copy link
Author

walro commented Oct 30, 2020

Looking at the latter commit, ignoring white-space changes, one ends up with: c54b4c1?w=1 which is a bit more manageable perhaps. I'll assume that the SSL stuff is unrelated. Also I imagine one could live without the renaming of the ensureEventDataDeserialize method.

I'll see if I can can even get a re-pro going for starters, as no tests were added. (Internally, we actually run without keepAlive set to true, so we are probably very unlikely to ever run into this problem)

fredijude pushed a commit to fredijude/mysql-binlog-connector-java that referenced this issue Dec 10, 2020
Merge conflicts have been resolved.
Refactoring and latch related changes have been added.
Authentication on greeting packet related code have been retained the same.
fredijude pushed a commit to fredijude/mysql-binlog-connector-java that referenced this issue Dec 10, 2020
Merge conflicts have been resolved.
Refactoring and latch related changes have been added.
Authentication on greeting packet related code have been retained the same.

Signed-off-by: Jude Frederic <jude@striim.com>
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

No branches or pull requests

2 participants