ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [1/2] ambari git commit: Revert "AMBARI-15429. Cannot specify ZooKeeper heap size via UI.(vbrodetskyi)"
Date Fri, 18 Mar 2016 17:05:31 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk d752f5ec8 -> 7242a4a18


Revert "AMBARI-15429. Cannot specify ZooKeeper heap size via UI.(vbrodetskyi)"

This reverts commit d7596e769f7546e621981f9e5501c1094e6e4f84.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7242a4a1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7242a4a1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7242a4a1

Branch: refs/heads/trunk
Commit: 7242a4a1803c6d707d40063d9a708609a5fe4bcf
Parents: f983862
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Fri Mar 18 13:04:57 2016 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Fri Mar 18 13:05:12 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/7242a4a1/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 e312507..7ef62bc 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
@@ -55,20 +55,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>
@@ -88,7 +74,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/7242a4a1/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 d64eb5c..9ff9125 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)
 


Mime
View raw message