Skip to content

Commit ec91fa5

Browse files
committed
Make the run task honor tests.es properties (#47860)
* Make the run task honor tests.es properties Closes #47797 With this PR we now again honor tests.es and tests.heap.size * remove debuging
1 parent d315726 commit ec91fa5

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,8 @@ private Map<String, String> getESEnvironment() {
660660
})
661661
.collect(Collectors.joining(" "));
662662
}
663-
defaultEnv.put("ES_JAVA_OPTS", "-Xms512m -Xmx512m -ea -esa " +
663+
String heapSize = System.getProperty("tests.heap.size", "512m");
664+
defaultEnv.put("ES_JAVA_OPTS", "-Xms" + heapSize + " -Xmx" + heapSize + " -ea -esa " +
664665
systemPropertiesString + " " +
665666
jvmArgsString + " " +
666667
// Support passing in additional JVM arguments

buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/RunTask.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,14 @@
1010
import java.io.IOException;
1111
import java.nio.file.Files;
1212
import java.util.HashSet;
13+
import java.util.Map;
1314
import java.util.Set;
15+
import java.util.stream.Collectors;
1416

1517
public class RunTask extends DefaultTestClustersTask {
1618

1719
private static final Logger logger = Logging.getLogger(RunTask.class);
20+
public static final String CUSTOM_SETTINGS_PREFIX = "tests.es.";
1821

1922
private Boolean debug = false;
2023

@@ -36,12 +39,19 @@ public void beforeStart() {
3639
int debugPort = 8000;
3740
int httpPort = 9200;
3841
int transportPort = 9300;
42+
Map<String, String> additionalSettings = System.getProperties().entrySet().stream()
43+
.filter(entry -> entry.getKey().toString().startsWith(CUSTOM_SETTINGS_PREFIX))
44+
.collect(Collectors.toMap(
45+
entry -> entry.getKey().toString().substring(CUSTOM_SETTINGS_PREFIX.length()),
46+
entry -> entry.getValue().toString()
47+
));
3948
for (ElasticsearchCluster cluster : getClusters()) {
4049
cluster.getFirstNode().setHttpPort(String.valueOf(httpPort));
4150
httpPort++;
4251
cluster.getFirstNode().setTransportPort(String.valueOf(transportPort));
4352
transportPort++;
4453
for (ElasticsearchNode node : cluster.getNodes()) {
54+
additionalSettings.forEach(node::setting);
4555
if (debug) {
4656
logger.lifecycle(
4757
"Running elasticsearch in debug mode, {} suspending until connected on debugPort {}",

0 commit comments

Comments
 (0)