github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-04-25 07:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove unused default heap size from distribution expansion variables (#68186)

Browse source 
The default heap size now resides in MachineDependentHeap and is applied
per our auto heap settings logic there vs living in jvm.options. For
this reason we no longer need to fill this in at build time, so we can
ditch these template variables.
This commit is contained in:
Mark Vieira 2021-01-29 12:51:14 -08:00 • committed by GitHub
parent d69c03359f
commit 6774b6eb14
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
distribution/build.gradle
View file

@ -530,8 +530,6 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
* <dt>path.env</dt> * <dt>path.env</dt>
* <dd>The env file sourced before bin/elasticsearch to set environment * <dd>The env file sourced before bin/elasticsearch to set environment
* variables. Think /etc/defaults/elasticsearch.</dd> * variables. Think /etc/defaults/elasticsearch.</dd>
* <dt>heap.min and heap.max</dt>
* <dd>Default min and max heap</dd>
* <dt>scripts.footer</dt> * <dt>scripts.footer</dt>
* <dd>Footer appended to control scripts embedded in the distribution that is * <dd>Footer appended to control scripts embedded in the distribution that is
* (almost) entirely there for cosmetic reasons.</dd> * (almost) entirely there for cosmetic reasons.</dd>
@ -543,7 +541,6 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
*/ */
subprojects { subprojects {
ext.expansionsForDistribution = { distributionType, oss, jdk -> ext.expansionsForDistribution = { distributionType, oss, jdk ->
final String defaultHeapSize = "1g"
final String packagingPathData = "path.data: /var/lib/elasticsearch" final String packagingPathData = "path.data: /var/lib/elasticsearch"
final String pathLogs = "/var/log/elasticsearch" final String pathLogs = "/var/log/elasticsearch"
final String packagingPathLogs = "path.logs: ${pathLogs}" final String packagingPathLogs = "path.logs: ${pathLogs}"
@ -597,9 +594,6 @@ subprojects {
'def': 'logs/gc.log' 'def': 'logs/gc.log'
], ],
'heap.min': defaultHeapSize,
'heap.max': defaultHeapSize,
'heap.dump.path': [ 'heap.dump.path': [
'deb': "-XX:HeapDumpPath=/var/lib/elasticsearch", 'deb': "-XX:HeapDumpPath=/var/lib/elasticsearch",
'rpm': "-XX:HeapDumpPath=/var/lib/elasticsearch", 'rpm': "-XX:HeapDumpPath=/var/lib/elasticsearch",