You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2016/03/17 14:26:13 UTC
ambari git commit: AMBARI-15429. Cannot specify ZooKeeper heap size
via UI.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.2 33bc51690 -> 01b01bdc4
AMBARI-15429. Cannot specify ZooKeeper heap size via UI.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/01b01bdc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/01b01bdc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/01b01bdc
Branch: refs/heads/branch-2.2
Commit: 01b01bdc4271ba2b9c03bc8452a8ebe31c7bb980
Parents: 33bc516
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Thu Mar 17 12:38:56 2016 +0200
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Thu Mar 17 12:38:56 2016 +0200
----------------------------------------------------------------------
.../3.4.5.2.0/configuration/zookeeper-env.xml | 16 +++++++++++++++-
.../3.4.5.2.0/package/scripts/params_linux.py | 2 +-
2 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/01b01bdc/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
index cabdf2c..27f7aca 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/configuration/zookeeper-env.xml
@@ -52,6 +52,20 @@
</property>
<property>
+ <name>zk_server_heapsize</name>
+ <value>1024</value>
+ <description>Maximum amount of memory each Zookeeper Server can use.</description>
+ <display-name>Zookeeper Server Maximum Memory</display-name>
+ <value-attributes>
+ <type>int</type>
+ <minimum>256</minimum>
+ <maximum>32768</maximum>
+ <unit>MB</unit>
+ <increment-step>256</increment-step>
+ </value-attributes>
+ </property>
+
+ <property>
<name>zookeeper_principal_name</name>
<description>ZooKeeper principal name</description>
</property>
@@ -71,7 +85,7 @@ export JAVA_HOME={{java64_home}}
export ZOOKEEPER_HOME={{zk_home}}
export ZOO_LOG_DIR={{zk_log_dir}}
export ZOOPIDFILE={{zk_pid_file}}
-export SERVER_JVMFLAGS={{zk_server_heapsize}}
+export SERVER_JVMFLAGS=-Xmx{{zk_server_heapsize}}
export JAVA=$JAVA_HOME/bin/java
export CLASSPATH=$CLASSPATH:/usr/share/zookeeper/*
http://git-wip-us.apache.org/repos/asf/ambari/blob/01b01bdc/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
index c6264ff..6f3de67 100644
--- a/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
+++ b/ambari-server/src/main/resources/common-services/ZOOKEEPER/3.4.5.2.0/package/scripts/params_linux.py
@@ -65,7 +65,7 @@ zk_log_dir = config['configurations']['zookeeper-env']['zk_log_dir']
zk_data_dir = config['configurations']['zoo.cfg']['dataDir']
zk_pid_dir = status_params.zk_pid_dir
zk_pid_file = status_params.zk_pid_file
-zk_server_heapsize = "-Xmx1024m"
+zk_server_heapsize = default('configurations/zookeeper-env/zk_server_heapsize', 1024)
client_port = default('/configurations/zoo.cfg/clientPort', None)