Updated Branches: refs/heads/branch-1.4.1 495c081e3 -> 2bcd13e4b
AMBARI-3454. Revisit the HBase configurations from ambari. (mahadev) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/2bcd13e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/2bcd13e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/2bcd13e4 Branch: refs/heads/branch-1.4.1 Commit: 2bcd13e4b6e553319bd0a6e93d2236c4121ad6c1 Parents: 495c081 Author: Mahadev Konar <[email protected]> Authored: Thu Oct 3 17:37:03 2013 -0700 Committer: Mahadev Konar <[email protected]> Committed: Thu Oct 3 17:37:08 2013 -0700 ---------------------------------------------------------------------- .../main/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb | 6 +++--- .../stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml | 2 +- .../HDPLocal/2.0.6/services/HDFS/configuration/hdfs-site.xml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2bcd13e4/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb b/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb index 9f0f36f..93d30fd 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb +++ b/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase-env.sh.erb @@ -34,8 +34,8 @@ export HBASE_CLASSPATH=${HBASE_CLASSPATH} # Below are what we set by default. May only work with SUN JVM. # For more on why as well as other possible settings, # see http://wiki.apache.org/hadoop/PerformanceTuning -export HBASE_OPTS="-XX:+UseConcMarkSweepGC" - +export HBASE_OPTS="-XX:+UseConcMarkSweepGC -XX:ErrorFile=<%=scope.function_hdp_template_var("hbase_log_dir")%>/hs_err_pid%p.log" +export SERVER_GC_OPTS="-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:<%=scope.function_hdp_template_var("hbase_log_dir")%>/gc.log-`date +'%Y%m%d%H%M'`" # Uncomment below to enable java garbage collection logging. # export HBASE_OPTS="$HBASE_OPTS -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$HBASE_HOME/logs/gc-hbase.log" @@ -45,7 +45,7 @@ export HBASE_OPTS="-XX:+UseConcMarkSweepGC" # # 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 -Xmn<%=scope.function_hdp_template_var("hbase_regionserver_xmn_size")%> -XX:CMSInitiatingOccupancyFraction=70 -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps -Xloggc:<%=scope.function_hdp_template_var("hbase_log_dir")%>/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")%>/hs_err_pid%p.log" +export HBASE_REGIONSERVER_OPTS="-Xmn<%=scope.function_hdp_template_var("hbase_regionserver_xmn_size")%> -XX:CMSInitiatingOccupancyFraction=70 -Xms<%=scope.function_hdp_template_var("hbase_regionserver_heapsize")%> -Xmx<%=scope.function_hdp_template_var("hbase_regionserver_heapsize")%>" # 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" http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2bcd13e4/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml index 69d59ef..79e0151 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HDFS/configuration/hdfs-site.xml @@ -165,7 +165,7 @@ <property> <name>dfs.https.port</name> - <value>50070</value> + <value>50470</value> <description> This property is used by HftpFileSystem. </description> http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2bcd13e4/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/HDFS/configuration/hdfs-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/HDFS/configuration/hdfs-site.xml index 69d59ef..79e0151 100644 --- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.6/services/HDFS/configuration/hdfs-site.xml @@ -165,7 +165,7 @@ <property> <name>dfs.https.port</name> - <value>50070</value> + <value>50470</value> <description> This property is used by HftpFileSystem. </description>
