Fix: (move and) make get_thread_id "nil safe" #11458
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(other part of same method assume JRuby already)
|
Can you please backport to 7.4.3 release as well? |
necessary since native (Java) thread is kept as a weak ref so un-wrapping should deal with a potentially GCd instance resolves elasticGH-11450
kares
force-pushed
the
safe-get_thread_id
branch
from
ba6a6d0
to
9cc0490
Compare
amitavmohanty01
approved these changes
Dec 29, 2019
|
there isn't another 7.4 release planned atm, this might end up in 7.5.2 or otherwise at 7.6.0 |
kares
commented
Dec 30, 2019
| @@ -37,18 +35,10 @@ def self.set_thread_plugin(plugin) | |||
| Thread.current[:plugin] = plugin | |||
| end | |||
|
|
|||
| def self.get_thread_id(thread) | |||
| if RUBY_ENGINE == "jruby" | |||
| JRuby.reference(thread).native_thread.id | |||
There was a problem hiding this comment.
the reason for moving the method to native is the JRuby.reference usage.
... a bit unfortunate API as it has side effects on (self) reflecting JRuby's Java classes
as of the date having this classes present some issues at runtime e.g. when looping through Class objects
|
LGTM |
elasticsearch-bot
pushed a commit
that referenced
this pull request
Dec 30, 2019
(other part of same method assume JRuby already) Fixes #11458
elasticsearch-bot
pushed a commit
that referenced
this pull request
Dec 30, 2019
elasticsearch-bot
pushed a commit
that referenced
this pull request
Dec 30, 2019
elasticsearch-bot
pushed a commit
that referenced
this pull request
Dec 30, 2019
elasticsearch-bot
pushed a commit
that referenced
this pull request
Dec 30, 2019
elasticsearch-bot
pushed a commit
that referenced
this pull request
Dec 30, 2019
(other part of same method assume JRuby already) Fixes #11458
elasticsearch-bot
pushed a commit
that referenced
this pull request
Dec 30, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
necessary since native (Java) thread is kept as a weak ref
so un-wrapping should deal with a potentially GCd instance
resolves GH-11450