Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix path.data as comma separated string (#76202) #79272

Merged
merged 2 commits into from
Oct 18, 2021
Merged

Fix path.data as comma separated string (#76202) #79272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae62046
Fix path.data as comma separated string (#76202)
rjernst Aug 12, 2021
d88f5d1
fix test
rjernst Oct 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions server/src/main/java/org/elasticsearch/env/Environment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,13 @@ public Environment(final Settings settings, final Path configPath) {

final Settings.Builder finalSettings = Settings.builder().put(settings);
if (PATH_DATA_SETTING.exists(settings)) {
finalSettings.putList(PATH_DATA_SETTING.getKey(), Arrays.stream(dataFiles).map(Path::toString).collect(Collectors.toList()));
if (dataPathUsesList(settings)) {
finalSettings.putList(PATH_DATA_SETTING.getKey(),
Arrays.stream(dataFiles).map(Path::toString).collect(Collectors.toList()));
} else {
assert dataFiles.length == 1;
finalSettings.put(PATH_DATA_SETTING.getKey(), dataFiles[0]);
}
}
finalSettings.put(PATH_HOME_SETTING.getKey(), homeFile);
finalSettings.put(PATH_LOGS_SETTING.getKey(), logsFile.toString());
Expand Down Expand Up @@ -303,7 +309,7 @@ public static boolean dataPathUsesList(Settings settings) {
return false;
}
String rawDataPath = settings.get(PATH_DATA_SETTING.getKey());
return rawDataPath.startsWith("[");
return rawDataPath.startsWith("[") || rawDataPath.contains(",");
}

public static FileStore getFileStore(final Path path) throws IOException {
Expand Down
15 changes: 15 additions & 0 deletions server/src/test/java/org/elasticsearch/env/EnvironmentTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static org.hamcrest.CoreMatchers.notNullValue;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.hamcrest.CoreMatchers.startsWith;
import static org.hamcrest.Matchers.arrayWithSize;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
Expand Down Expand Up @@ -72,6 +73,15 @@ public void testPathDataNotSetInEnvironmentIfNotSet() {
assertFalse(Environment.PATH_DATA_SETTING.exists(environment.settings()));
}

public void testPathDataLegacyCommaList() {
final Settings settings = Settings.builder()
.put("path.home", createTempDir().toAbsolutePath())
.put("path.data", createTempDir().toAbsolutePath() + "," + createTempDir().toAbsolutePath())
.build();
final Environment environment = new Environment(settings, null);
assertThat(environment.dataFiles(), arrayWithSize(2));
}

public void testPathLogsWhenNotSet() {
final Path pathHome = createTempDir().toAbsolutePath();
final Settings settings = Settings.builder().put("path.home", pathHome).build();
Expand Down Expand Up @@ -173,6 +183,11 @@ public void testSingleDataPathListCheck() {
.putList(Environment.PATH_DATA_SETTING.getKey(), createTempDir().toString()).build();
assertThat(Environment.dataPathUsesList(settings), is(true));
}
{
final Settings settings = Settings.builder()
.put(Environment.PATH_DATA_SETTING.getKey(), createTempDir().toString() + "," + createTempDir().toString()).build();
assertThat(Environment.dataPathUsesList(settings), is(true));
}
}

private void assertPath(final String actual, final Path expected) {
Expand Down