-
Notifications
You must be signed in to change notification settings - Fork 9.1k
HDFS-16084. Fix getJNIEnv crash due to incorrect state set to tls var #6969
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
Conversation
|
💔 -1 overall
This message was automatically generated. |
|
saw the docker CI failed, am I doing something wrong? |
I found that yasm download address changed. See #6973 for more information. |
guess I should wait for your PR merged and then rebase mine? |
2e1c2c6 to
f6dc302
Compare
|
💔 -1 overall
This message was automatically generated. |
f6dc302 to
e330ff4
Compare
|
💔 -1 overall
This message was automatically generated. |
e330ff4 to
e7383eb
Compare
|
💔 -1 overall
This message was automatically generated. |
e7383eb to
a031775
Compare
|
💔 -1 overall
This message was automatically generated. |
a031775 to
b99bd3e
Compare
|
💔 -1 overall
This message was automatically generated. |
b99bd3e to
cdc9ccb
Compare
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
Finally, the ci check passed @zhengchenyu @tomscut whom else shall be invited to review this pull request? |
Hexiaoqiao
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great catch. Thanks @kevincai for your works. Leave some nit comments inline. PFYI.
hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfs/jni_helper.c
Show resolved
Hide resolved
...dfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/tests/libhdfs_getjni_test.cc
Show resolved
Hide resolved
Hexiaoqiao
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. +1 from my side.
|
Committed to trunk. Thanks @kevincai for your contributions! BTW, what's your JIRA account? When I want to assign https://issues.apache.org/jira/browse/HDFS-16084 to you but I am not sure if the reporter and you is the same one. Thanks! |
I didn't apply one. |
|
@Hexiaoqiao you want to get into hadoop branch 3.4, so target 3.4.2? |
|
@steveloughran No plan to backport to other active branches if no more requirement.
Not see any place marked 3.4.2, would you mind to confirm? Thanks. |
What about apply one at JIRA side? @kevincai |
Got the jira account created, please assign to me as |
branch-3.4 is going to be where 3.4.2 is going to be forked from -if you do a PR for that branch it'll be out on the relevant release |
…#6969). Contributed by Kevin Cai. Signed-off-by: He Xiaoqiao <[email protected]> (cherry picked from commit 5745a7d)
Hi @steveloughran , have cherrypick to branch-3.4, Please double check. |
|
@Hexiaoqiao looks good. you want to try for branch-3.4.1. too? |
…apache#6969). Contributed by Kevin Cai. Signed-off-by: He Xiaoqiao <[email protected]>
…apache#6969). Contributed by Kevin Cai. Signed-off-by: He Xiaoqiao <[email protected]>
|
@kevincai , @Hexiaoqiao , @steveloughran this PR is causing the Windows CI to fail. Please see - https://ci-hadoop.apache.org/view/Hadoop/job/hadoop-qbt-trunk-java8-win10-x86_64/647/artifact/out/patch-mvninstall-root.txt Here's the error - Could you please fix this or revert this PR? |
|
@kevincai , @Hexiaoqiao , @steveloughran I've attempted a fix for this in #7096. Let's see if it works. |
|
Started the Windows CI run for the fix - https://ci-hadoop.apache.org/view/Hadoop/job/hadoop-qbt-trunk-java8-win10-x86_64/652/. |
Description of PR
the jni state tls object is set before passing all the checks, resulting an invalid state in the tls and been hit later on with invalid object which already destroyed.
How was this patch tested?
set the tls object lastly when passing all checks. A sample binary is added to expose this issue and verify the fix.
For code changes:
LICENSE,LICENSE-binary,NOTICE-binaryfiles?