You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ol...@apache.org on 2018/05/01 11:17:38 UTC
[ambari] branch trunk updated: [AMBARI-23732] Increase default java
stack size and make it configurable for Infra Solr (#1142)
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 1834e7a [AMBARI-23732] Increase default java stack size and make it configurable for Infra Solr (#1142)
1834e7a is described below
commit 1834e7a02503d9d47d205726ccac6dacc1a8dfb8
Author: Olivér Szabó <ol...@gmail.com>
AuthorDate: Tue May 1 13:17:35 2018 +0200
[AMBARI-23732] Increase default java stack size and make it configurable for Infra Solr (#1142)
* AMBARI-23732. Increase default java stack size and make it configurable for Infra Solr
* AMBARI-23732. Do not add SOLR_JAVA_STACK_SIZE to SOLR_OPTS as it will be done by solr start script anyway.
* AMBARI-23732. Use mb instead of kb
---
.../0.1.0/configuration/infra-solr-env.xml | 14 ++++++++++++++
.../AMBARI_INFRA_SOLR/0.1.0/package/scripts/params.py | 1 +
.../0.1.0/properties/infra-solr-env.sh.j2 | 2 ++
.../src/test/python/stacks/2.4/configs/default.json | 1 +
4 files changed, 18 insertions(+)
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/configuration/infra-solr-env.xml b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/configuration/infra-solr-env.xml
index 2f8fc63..67ed8c1 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/configuration/infra-solr-env.xml
+++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/configuration/infra-solr-env.xml
@@ -183,6 +183,20 @@
<on-ambari-upgrade add="false"/>
</property>
<property>
+ <name>infra_solr_java_stack_size</name>
+ <value>1</value>
+ <display-name>Infra Solr Java Stack Size</display-name>
+ <description>Java Stack Size of Infra Solr (-Xss) in MB.</description>
+ <value-attributes>
+ <type>int</type>
+ <minimum>1</minimum>
+ <maximum>128</maximum>
+ <unit>MB</unit>
+ <increment-step>1</increment-step>
+ </value-attributes>
+ <on-ambari-upgrade add="true"/>
+ </property>
+ <property>
<name>infra_solr_jmx_enabled</name>
<value>false</value>
<display-name>Enable JMX</display-name>
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/params.py
index b1c7e33..c1376c8 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/params.py
@@ -106,6 +106,7 @@ if "infra-solr-env" in config['configurations']:
infra_solr_znode = config['configurations']['infra-solr-env']['infra_solr_znode']
infra_solr_min_mem = format(config['configurations']['infra-solr-env']['infra_solr_minmem'])
infra_solr_max_mem = format(config['configurations']['infra-solr-env']['infra_solr_maxmem'])
+ infra_solr_java_stack_size = format(config['configurations']['infra-solr-env']['infra_solr_java_stack_size'])
infra_solr_instance_count = len(config['clusterHostInfo']['infra_solr_hosts'])
infra_solr_datadir = format(config['configurations']['infra-solr-env']['infra_solr_datadir'])
infra_solr_data_resources_dir = os.path.join(infra_solr_datadir, 'resources')
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/properties/infra-solr-env.sh.j2 b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/properties/infra-solr-env.sh.j2
index 518e712..2a4c78e 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/properties/infra-solr-env.sh.j2
+++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/properties/infra-solr-env.sh.j2
@@ -22,6 +22,8 @@ SOLR_JAVA_HOME={{java64_home}}
# Increase Java Min/Max Heap as needed to support your indexing / query needs
SOLR_JAVA_MEM="-Xms{{infra_solr_min_mem}}m -Xmx{{infra_solr_max_mem}}m"
+SOLR_JAVA_STACK_SIZE="-Xss{{infra_solr_java_stack_size}}m"
+
# Enable verbose GC logging
GC_LOG_OPTS="-verbose:gc -XX:+PrintHeapAtGC -XX:+PrintGCDetails \
-XX:+PrintGCDateStamps -XX:+PrintGCTimeStamps -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime"
diff --git a/ambari-server/src/test/python/stacks/2.4/configs/default.json b/ambari-server/src/test/python/stacks/2.4/configs/default.json
index 602d657..1142f7c 100644
--- a/ambari-server/src/test/python/stacks/2.4/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.4/configs/default.json
@@ -391,6 +391,7 @@
"infra_solr_port": "8886",
"infra_solr_minmem": "512",
"infra_solr_maxmem": "512",
+ "infra_solr_java_stack_size" : "1",
"infra_solr_znode": "/infra-solr",
"infra_solr_conf": "/etc/ambari-infra-solr",
"infra_solr_pid_dir": "/var/run/ambari-infra-solr",
--
To stop receiving notification emails like this one, please contact
oleewere@apache.org.