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

Backport PR #13447 to 7.16: Fix: patch Puma around a JRuby ARM64 bug #13454

Merged
merged 1 commit into from
Dec 1, 2021

Conversation

kares
Copy link
Contributor

@kares kares commented Nov 25, 2021

Backport PR #13447 to 7.16 branch.

Original message:

Here we're emulating the fallback logic just like it would happen on JRuby < 9.2.18.0.

The only consequence with the dummy closed_socket? implementation seems to be stopping a request early.

Please note that the closed_socket? implementation was slightly different on Puma 4.x, however under JRuby, 4.x always uses the dummy fallback due the RUBY_PLATFORM =~ /linux/ check (RUBY_PLATFORM returns "java" on JRuby).

Release notes

[rn:skip]

What does this PR do?

Patches around an upstream (JNR) bug which surfaces under ARM64.

Why is it important/What is the impact to the user?

Usable AARCH64 support (under Docker).

Author's Checklist

  • confirm with ARM64 CI (Docker) tests

Related issues

Co-authored-by: João Duarte <jsvd@users.noreply.github.com>
(cherry picked from commit 32690cb)
Copy link
Member

@jsvd jsvd left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@jsvd jsvd left a comment

Choose a reason for hiding this comment

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

LGTM

@kares kares merged commit 90b32f1 into elastic:7.16 Dec 1, 2021
@kares kares added v7.16.0 and removed v7.16.1 labels Dec 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants