You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by hi...@apache.org on 2012/08/18 03:39:41 UTC
svn commit: r1374499 - in /incubator/ambari/branches/branch-0.9: ./
hmc/puppet/modules/hdp-hbase/manifests/
hmc/puppet/modules/hdp-hbase/templates/
hmc/puppet/modules/hdp/lib/puppet/parser/functions/
Author: hitesh
Date: Sat Aug 18 01:39:40 2012
New Revision: 1374499
URL: http://svn.apache.org/viewvc?rev=1374499&view=rev
Log:
AMBARI-672. Hardcoded -Xmn value for hbase causes region servers to fail to start in machines with less memory (Contributed by hitesh)
Added:
incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp/lib/puppet/parser/functions/hdp_calc_xmn_from_xms.rb
- copied unchanged from r1374498, incubator/ambari/trunk/hmc/puppet/modules/hdp/lib/puppet/parser/functions/hdp_calc_xmn_from_xms.rb
Modified:
incubator/ambari/branches/branch-0.9/CHANGES.txt
incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp-hbase/manifests/params.pp
incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb
Modified: incubator/ambari/branches/branch-0.9/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/CHANGES.txt?rev=1374499&r1=1374498&r2=1374499&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/CHANGES.txt (original)
+++ incubator/ambari/branches/branch-0.9/CHANGES.txt Sat Aug 18 01:39:40 2012
@@ -6,6 +6,9 @@ characters wide.
Release 0.9.0 - unreleased
+ AMBARI-672. Hardcoded -Xmn value for hbase causes region servers to fail to start in
+ machines with less memory (hitesh)
+
AMBARI-667. After reboots, namenode start fails as it thinks dfs is not formatted (hitesh)
AMBARI-668. Ambari should install yum priorities plugin on all nodes to ensure repo
Modified: incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp-hbase/manifests/params.pp
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp-hbase/manifests/params.pp?rev=1374499&r1=1374498&r2=1374499&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp-hbase/manifests/params.pp (original)
+++ incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp-hbase/manifests/params.pp Sat Aug 18 01:39:40 2012
@@ -36,6 +36,7 @@ class hdp-hbase::params() inherits hdp::
$hbase_regionserver_heapsize = hdp_default("hadoop/hbase-env/hbase_regionserver_heapsize","1000m")
+ $hbase_regionserver_xmn_size = hdp_calc_xmn_from_xms("$hbase_regionserver_heapsize","0.2","512")
### hbase-site.xml
$hbase_hdfs_root_dir = hdp_default("hadoop/hbase-site/hbase_hdfs_root_dir","/apps/hbase/data")
Modified: incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb?rev=1374499&r1=1374498&r2=1374499&view=diff
==============================================================================
--- incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb (original)
+++ incubator/ambari/branches/branch-0.9/hmc/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb Sat Aug 18 01:39:40 2012
@@ -45,7 +45,7 @@ export HBASE_OPTS="-ea -XX:+UseConcMarkS
#
# export HBASE_JMX_BASE="-Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false"
export HBASE_MASTER_OPTS="-Xmx<%=scope.function_hdp_template_var("hbase_master_heapsize")%>"
-export HBASE_REGIONSERVER_OPTS="-server -XX:ParallelGCThreads=4 -XX:+UseParNewGC -Xmn512m -XX:CMSInitiatingOccupancyFraction=80 -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps -Xloggc:<%=scope.function_hdp_template_var("hbase_log_dir")%>/log/$USER/gc.log-`date +'%Y%m%d%H%M'` -Xms<%=scope.function_hdp_template_var("hbase_regionserver_heapsize")%> -Xmx<%=scope.function_hdp_template_var("hbase_regionserver_heapsize")%> -XX:ErrorFile=<%=scope.function_hdp_template_var("hbase_log_dir")%>/log/$USER/hs_err_pid%p.log"
+export HBASE_REGIONSERVER_OPTS="-server -XX:ParallelGCThreads=4 -XX:+UseParNewGC -Xmn<%=scope.function_hdp_template_var("hbase_regionserver_xmn_size")%> -XX:CMSInitiatingOccupancyFraction=80 -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps -Xloggc:<%=scope.function_hdp_template_var("hbase_log_dir")%>/log/$USER/gc.log-`date +'%Y%m%d%H%M'` -Xms<%=scope.function_hdp_template_var("hbase_regionserver_heapsize")%> -Xmx<%=scope.function_hdp_template_var("hbase_regionserver_heapsize")%> -XX:ErrorFile=<%=scope.function_hdp_template_var("hbase_log_dir")%>/log/$USER/hs_err_pid%p.log"
# export HBASE_THRIFT_OPTS="$HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10103"
# export HBASE_ZOOKEEPER_OPTS="$HBASE_JMX_BASE -Dcom.sun.management.jmxremote.port=10104"