Resolve JAVA_HOME for source builds lazily #1027
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
With this commit we resolve JAVA_HOME lazily when attempting to build Elasticsearch. When a source build is externally provided to Rally's source artifact cache, there is no need to actually build it. However, if the target system does not have any JDK installed and we attempt to install Elasticsearch, the build subsystem is eagerly initialized (despite the artifact being already cached) and is complaining that it cannot find a JDK to build the artifact. By lazily resolving JAVA_HOME we avoid that error.
danielmitterdorfer
added
bug
hub-cap
approved these changes
Jul 16, 2020
esrally/mechanic/supplier.py
Outdated
| try: | ||
| build_jdk = int(raw_build_jdk) | ||
| except ValueError: | ||
| raise exceptions.SystemSetupError(f"Car config key \"build.jdk\" is invalid: \"{raw_build_jdk}\" (must be int)") |
There was a problem hiding this comment.
FWIW im perfectly fine if we use single quotes inside f strings for things like this... f"blah 'this thing' blah", I hate seeing \ when we can get around it :)
If you dont agree, thats fine by me!
There was a problem hiding this comment.
Good point. Usually we use square brackets anyway instead of double quotes. I've pushed a change in 690d568.
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.
With this commit we resolve JAVA_HOME lazily when attempting to build
Elasticsearch. When a source build is externally provided to Rally's
source artifact cache, there is no need to actually build it. However,
if the target system does not have any JDK installed and we attempt to
install Elasticsearch, the build subsystem is eagerly initialized
(despite the artifact being already cached) and is complaining that it
cannot find a JDK to build the artifact. By lazily resolving JAVA_HOME
we avoid that error.