honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-24 17:09:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use zen2 with testclusters (#37352)

Browse Source
This commit is contained in:
Alpar Torok 2019-01-21 12:52:25 +02:00 committed by GitHub
parent 09a6ba50ef
commit 3a2b616579
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
View File

@ -324,8 +324,9 @@ public class ElasticsearchNode {
getConfPathSharedData().mkdirs(); getConfPathSharedData().mkdirs();
getConfPathLogs().mkdirs(); getConfPathLogs().mkdirs();
LinkedHashMap<String, String> config = new LinkedHashMap<>(); LinkedHashMap<String, String> config = new LinkedHashMap<>();
config.put("cluster.name", "cluster-" + safeName(name)); String nodeName = safeName(name);
config.put("node.name", "node-" + safeName(name)); config.put("cluster.name",nodeName);
config.put("node.name", nodeName);
config.put("path.repo", getConfPathRepo().getAbsolutePath()); config.put("path.repo", getConfPathRepo().getAbsolutePath());
config.put("path.data", getConfPathData().getAbsolutePath()); config.put("path.data", getConfPathData().getAbsolutePath());
config.put("path.logs", getConfPathLogs().getAbsolutePath()); config.put("path.logs", getConfPathLogs().getAbsolutePath());
@ -342,6 +343,9 @@ public class ElasticsearchNode {
if (Version.fromString(version).getMajor() >= 6) { if (Version.fromString(version).getMajor() >= 6) {
config.put("cluster.routing.allocation.disk.watermark.flood_stage", "1b"); config.put("cluster.routing.allocation.disk.watermark.flood_stage", "1b");
} }
if (Version.fromString(version).getMajor() >= 7) {
config.put("cluster.initial_master_nodes", "[" + nodeName + "]");
}
try { try {
Files.write( Files.write(
getConfigFile().toPath(), getConfigFile().toPath(),

2
buildSrc/src/test/java/org/elasticsearch/gradle/testclusters/TestClustersPluginIT.java
View File

@ -21,11 +21,9 @@ package org.elasticsearch.gradle.testclusters;
import org.elasticsearch.gradle.test.GradleIntegrationTestCase; import org.elasticsearch.gradle.test.GradleIntegrationTestCase;
import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.BuildResult;
import org.gradle.testkit.runner.GradleRunner; import org.gradle.testkit.runner.GradleRunner;
import org.junit.Ignore;
import java.util.Arrays; import java.util.Arrays;
@Ignore // https://github.com/elastic/elasticsearch/issues/37218
public class TestClustersPluginIT extends GradleIntegrationTestCase { public class TestClustersPluginIT extends GradleIntegrationTestCase {
public void testListClusters() { public void testListClusters() {