Die cwd die #10923
Merged
Die cwd die #10923
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
| public Environment(Settings settings) { | ||
| this.settings = settings; | ||
| if (settings.get("path.home") != null) { | ||
| homeFile = PathUtils.get(cleanPath(settings.get("path.home"))); | ||
| } else { | ||
| homeFile = PathUtils.get(System.getProperty("user.dir")); | ||
| throw new IllegalStateException("path.home is not configured"); |
|
if no one has opinions then, I will push in 24 hours. |
|
this looks great - the only thing that I'd like to see is a note in the migration guide that this has been fixed and that for instance the dictionary files should be located in a different place. It's in |
Conflicts: src/test/java/org/elasticsearch/client/AbstractClientHeadersTests.java
|
LGTM |
rmuir
added a commit
that referenced
this pull request
May 4, 2015
Remove CWD access in tests and don't implicitly use CWD/user.dir for configuration.
clintongormley
added
>enhancement
:Core/Infra/Settings
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.
See #10877 for reference.
Currently some code looks in CWD and places like $user.home for configuration files in a confusing way, in some cases even overriding other paths (so if you have a stray elasticsearch.yml there, good luck).
Tests hide the problem because they add too many permissions. We fixed that here and then all tests were failing, and made hacky changes to get tests passing again.
So some of the changes here can be cleaned up / solved differently. For example we could look for the custom hunspell data directory in Environment, grant access to it, and deprecate it instead of throwing an error. But, with what is here all tests pass so I think we know enough to discuss so we can move forward.