Remove multiple paths from elasticsearch-node tool#72351
Merged
rjernst merged 3 commits intoelastic:masterfrom May 4, 2021
Merged
Remove multiple paths from elasticsearch-node tool#72351rjernst merged 3 commits intoelastic:masterfrom
rjernst merged 3 commits intoelastic:masterfrom
Conversation
Collaborator
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
DaveCTurner
reviewed
Apr 28, 2021
Member
DaveCTurner
left a comment
There was a problem hiding this comment.
Looks ok to me but I think we should fix NodeEnvironment first, see comments below.
| final Path[] dataPaths = | ||
| Arrays.stream(lock.getNodePaths()).filter(Objects::nonNull).map(p -> p.path).toArray(Path[]::new); | ||
| if (dataPaths.length == 0) { | ||
| if (lock.getNodePaths().length == 0) { |
Member
There was a problem hiding this comment.
NodeEnvironment.NodeLock#nodePaths always has length 1 now, so this will never happen. I'd prefer to refactor MDPs out of NodeEnvironment (including NodeEnvironment.NodeLock) first, because this was tricky to spot and there may be other things like it that I don't see.
| // create same directory structure as prod does | ||
| Files.createDirectories(dataDir); | ||
| dataPaths = new Path[] {dataDir}; | ||
| dataPath = dataDir; |
Member
There was a problem hiding this comment.
May as well get rid of the dataDir variable entirely and just use the field.
Member
Author
|
@DaveCTurner I updated this PR since NodeEnvironment is now single-fied. |
17 tasks
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Oct 4, 2021
…2351)" This reverts commit 619a011. relates elastic#78525 relates elastic#71205
elasticsearchmachine
pushed a commit
that referenced
this pull request
Oct 4, 2021
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
relates #71205