honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20080 from jasontedor/min-heap-equals-max-heap 

Set default min heap equal to default max heap
This commit is contained in:
Jason Tedor 2016-08-19 13:55:26 -04:00 committed by GitHub
parent 57c3dcb7d7 13e20e3320
commit 503059d9a5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterConfiguration.groovy
View File

@ -54,7 +54,9 @@ class ClusterConfiguration {
boolean debug = false boolean debug = false
@Input @Input
String jvmArgs = System.getProperty('tests.jvm.argline', '') String jvmArgs = "-Xms" + System.getProperty('tests.heap.size', '512m') +
" " + "-Xmx" + System.getProperty('tests.heap.size', '512m') +
" " + System.getProperty('tests.jvm.argline', '')
/** /**
* The seed nodes port file. In the case the cluster has more than one node we use a seed node * The seed nodes port file. In the case the cluster has more than one node we use a seed node

6
distribution/build.gradle
View File

@ -479,6 +479,8 @@ task run(type: RunTask) {
* </dl> * </dl>
*/ */
Map<String, String> expansionsForDistribution(distributionType) { Map<String, String> expansionsForDistribution(distributionType) {
final String defaultHeapSize = "2g"
String footer = "# Built for ${project.name}-${project.version} " + String footer = "# Built for ${project.name}-${project.version} " +
"(${distributionType})" "(${distributionType})"
Map<String, Object> expansions = [ Map<String, Object> expansions = [
@ -498,8 +500,8 @@ Map<String, String> expansionsForDistribution(distributionType) {
'def': '', 'def': '',
], ],
'heap.min': "256m", 'heap.min': defaultHeapSize,
'heap.max': "2g", 'heap.max': defaultHeapSize,
'stopping.timeout': [ 'stopping.timeout': [
'rpm': 86400, 'rpm': 86400,