Author: swagle
Date: Fri Mar 29 18:27:24 2013
New Revision: 1462577
URL: http://svn.apache.org/r1462577
Log:
AMBARI-1749. set default heap size for zookeeper. (swagle)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/params.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-zookeeper/templates/zookeeper-env.sh.erb
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1462577&r1=1462576&r2=1462577&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Mar 29 18:27:24 2013
@@ -534,6 +534,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1749. set default heap size for zookeeper. (swagle)
+
AMBARI-1748. JDK option on the UI when used is not passed onto the global
parameters. (srimanth)
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/params.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/params.pp?rev=1462577&r1=1462576&r2=1462577&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/params.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-zookeeper/manifests/params.pp
Fri Mar 29 18:27:24 2013
@@ -28,7 +28,7 @@ class hdp-zookeeper::params() inherits h
$zk_data_dir = hdp_default("zk_data_dir","/var/lib/zookeeper/data")
$zk_pid_dir = hdp_default("zk_pid_dir","/var/run/zookeeper")
$zk_pid_file = "${zk_pid_dir}/zookeeper_server.pid"
-
+ $zk_server_heapsize = hdp_default("zk_server_heapsize","-Xmx1024m")
$tickTime = hdp_default("tickTime","2000")
$initLimit = hdp_default("initLimit","10")
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-zookeeper/templates/zookeeper-env.sh.erb
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-zookeeper/templates/zookeeper-env.sh.erb?rev=1462577&r1=1462576&r2=1462577&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-zookeeper/templates/zookeeper-env.sh.erb
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-zookeeper/templates/zookeeper-env.sh.erb
Fri Mar 29 18:27:24 2013
@@ -15,11 +15,11 @@
export JAVA_HOME=<%=scope.function_hdp_java_home()%>
export ZOO_LOG_DIR=<%=scope.function_hdp_template_var("zk_log_dir")%>
export ZOOPIDFILE=<%=scope.function_hdp_template_var("zk_pid_file")%>
-export SERVER_JVMFLAGS=
+export
SERVER_JVMFLAGS=<%=scope.function_hdp_template_var("zk_server_heapsize")%>
export JAVA=$JAVA_HOME/bin/java
export CLASSPATH=$CLASSPATH:/usr/share/zookeeper/*
<% if scope.function_hdp_template_var("security_enabled") == true %>
export SERVER_JVMFLAGS="$SERVER_JVMFLAGS
-Djava.security.auth.login.config=<%=scope.function_hdp_template_var("::hdp-zookeeper::params::zk_server_jaas_file")%>"
export CLIENT_JVMFLAGS="$CLIENT_JVMFLAGS
-Djava.security.auth.login.config=<%=scope.function_hdp_template_var("::hdp-zookeeper::params::zk_client_jaas_file")%>"
-<% end %>
\ No newline at end of file
+<% end %>
