Use bundled JDK in Sys V init #45593
Merged
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
This commit addresses an issue when trying to using Elasticsearch on systems with Sys V init and the bundled JDK was not being used. Instead, we were still inadvertently trying to fallback on the path. This commit removes that fallback as that is against our intentions for 7.x where we only support the bundled JDK or an explicit JDK via JAVA_HOME.
jasontedor
added
>bug
:Delivery/Packaging
|
Pinging @elastic/es-core-infra |
pugnascotia
reviewed
Aug 15, 2019
| assumeThat(distribution().hasJdk, is(true)); | ||
|
|
||
| final Result readlink = sh.run("readlink /usr/bin/java"); | ||
| assertThat(readlink.exitCode, equalTo(0)); |
There was a problem hiding this comment.
Shell.run already checks that exitCode is 0.
There was a problem hiding this comment.
Thanks, I pushed 4581efe.
pugnascotia
approved these changes
Aug 15, 2019
rjernst
reviewed
Aug 15, 2019
| echo "Could not find any executable java binary. Please install java in your PATH or set JAVA_HOME" | ||
| exit 1 | ||
| fi | ||
| if [ ! -z "${JAVA_HOME}" ]; then |
There was a problem hiding this comment.
We don't seem to actually use JAVA here anywhere. Other than exporting JAVA_HOME, could we remove this logic and let bin/elasticsearch handle it?
There was a problem hiding this comment.
I'll explore the consequences of this in a follow-up, I want to get this fix in for 7.3.1.
rjernst
approved these changes
Aug 15, 2019
| fi | ||
|
|
||
| if [ ! -x "$JAVA" ]; then | ||
| echo "Could not find any executable java binary. Please install java in your PATH or set JAVA_HOME" |
There was a problem hiding this comment.
This error message is still referencing PATH
jasontedor
added a commit
that referenced
this pull request
Aug 15, 2019
This commit addresses an issue when trying to using Elasticsearch on systems with Sys V init and the bundled JDK was not being used. Instead, we were still inadvertently trying to fallback on the path. This commit removes that fallback as that is against our intentions for 7.x where we only support the bundled JDK or an explicit JDK via JAVA_HOME.
jasontedor
added a commit
that referenced
this pull request
Aug 15, 2019
This commit addresses an issue when trying to using Elasticsearch on systems with Sys V init and the bundled JDK was not being used. Instead, we were still inadvertently trying to fallback on the path. This commit removes that fallback as that is against our intentions for 7.x where we only support the bundled JDK or an explicit JDK via JAVA_HOME.
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.
This commit addresses an issue when trying to using Elasticsearch on systems with Sys V init and the bundled JDK was not being used. Instead, we were still inadvertently trying to fallback on the path. This commit removes that fallback as that is against our intentions for 7.x where we only support the bundled JDK or an explicit JDK via JAVA_HOME.
Closes #45542