You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jo...@apache.org on 2016/03/18 18:06:39 UTC
[2/2] ambari git commit: Revert "AMBARI-15429. Cannot specify
ZooKeeper heap size via UI.(vbrodetskyi)"
Revert "AMBARI-15429. Cannot specify ZooKeeper heap size via UI.(vbrodetskyi)"
This reverts commit 01b01bdc4271ba2b9c03bc8452a8ebe31c7bb980.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e81d5721
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e81d5721
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e81d5721
Branch: refs/heads/branch-2.2
Commit: e81d5721c652da684f7f29b0d930c330c28686c7
Parents: b907049
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Fri Mar 18 13:06:21 2016 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Fri Mar 18 13:06:21 2016 -0400
----------------------------------------------------------------------
.../3.4.5.2.0/configuration/zookeeper-env.xml | 16 +---------------
.../3.4.5.2.0/package/scripts/params_linux.py | 2 +-
2 files changed, 2 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e81d5721/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 27f7aca..cabdf2c 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,20 +52,6 @@
</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>
@@ -85,7 +71,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=-Xmx{{zk_server_heapsize}}
+export SERVER_JVMFLAGS={{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/e81d5721/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 6f3de67..c6264ff 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 = default('configurations/zookeeper-env/zk_server_heapsize', 1024)
+zk_server_heapsize = "-Xmx1024m"
client_port = default('/configurations/zoo.cfg/clientPort', None)