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
commit 503059d9a5
2 changed files with 7 additions and 3 deletions

View File

@ -54,7 +54,9 @@ class ClusterConfiguration {
boolean debug = false
@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

View File

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