Remove multiple paths from ShardPath #72713
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
rjernst
added
:Core/Infra/Core
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
jasontedor
requested changes
May 5, 2021
| @@ -107,51 +107,38 @@ public static ShardPath loadShardPath(Logger logger, NodeEnvironment env, | |||
| ShardId shardId, String customDataPath) throws IOException { | |||
| final Path shardPath = env.availableShardPath(shardId); | |||
| final Path sharedDataPath = env.sharedDataPath(); | |||
| return loadShardPath(logger, shardId, customDataPath, new Path[] { shardPath }, sharedDataPath); | |||
| return loadShardPath(logger, shardId, customDataPath, shardPath, sharedDataPath); | |||
| } | |||
|
|
|||
| /** | |||
| * This method walks through the nodes shard paths to find the data and state path for the given shard. If multiple | |||
| * directories with a valid shard state exist the one with the highest version will be used. | |||
| * <b>Note:</b> this method resolves custom data locations for the shard. | |||
| */ | |||
There was a problem hiding this comment.
This comment looks out of date now.
There was a problem hiding this comment.
Good catch. I tweaked these in 16975ec
| } | ||
|
|
||
| /** | ||
| * This method walks through the nodes shard paths to find the data and state path for the given shard. If multiple | ||
| * directories with a valid shard state exist the one with the highest version will be used. | ||
| * <b>Note:</b> this method resolves custom data locations for the shard. | ||
| */ | ||
| public static ShardPath loadShardPath(Logger logger, ShardId shardId, String customDataPath, Path[] availableShardPaths, | ||
| public static ShardPath loadShardPath(Logger logger, ShardId shardId, String customDataPath, Path availableShardPath, |
There was a problem hiding this comment.
Isn't this just shardPath now?
This was referenced May 19, 2021
rjernst
added a commit
to rjernst/elasticsearch
that referenced
this pull request
Sep 29, 2021
This reverts commit 08a89c8.
elasticsearchmachine
pushed a commit
that referenced
this pull request
Sep 29, 2021
17 tasks
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.
relates #71205