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 keepalive and shared key bug #2456

Merged
merged 2 commits into from
Jun 14, 2019

Conversation

ganmacs
Copy link
Member

@ganmacs ganmacs commented Jun 13, 2019

Which issue(s) this PR fixes:
Fixes #2451

What this PR does / why we need it:

If the socket which already handshaked tries to handshake, it will be
blocked and raise IO::WaitReadable here.
So, I changed the code to avoid invoking handshake twice on the same socket.

Docs Changes:

no

Release Note:

no

If keepalive, #connect always returns integer returned by L1104

Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
if the socket which already handshaked tries to handshake, it will be
blocked and raise IO::WaitReadable [here](https://github.com/fluent/fluentd/blob/12ffa0afe313737bf09900efce8c8656baaf77bc/lib/fluent/plugin/out_forward.rb#L787
).

Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
@ganmacs ganmacs requested a review from repeatedly June 13, 2019 09:12
@ganmacs ganmacs force-pushed the fix-keepalive-and-shared-key-bug branch from 6703121 to 12f3380 Compare June 13, 2019 09:12
@ganmacs ganmacs added the bug Something isn't working label Jun 13, 2019
@repeatedly repeatedly merged commit 570a6a5 into fluent:master Jun 14, 2019
@repeatedly
Copy link
Member

Thanks. I confirmed this works.

@ganmacs ganmacs deleted the fix-keepalive-and-shared-key-bug branch June 14, 2019 05:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

out_foward with keepalive and shared_key don't work together
2 participants