Updated Branches: refs/heads/trunk a8ba15f48 -> 7a8c397df
AMBARI-3001. Make HADOOP_CLIENT_OPTS for memory configurable via the UI/backend so that pig/hive/hcat can use it when running jobs. (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/7a8c397d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/7a8c397d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/7a8c397d Branch: refs/heads/trunk Commit: 7a8c397df2744f45bc2fbd357e9d7144a3eed656 Parents: a8ba15f Author: Mahadev Konar <[email protected]> Authored: Thu Sep 5 11:15:17 2013 -0700 Committer: Mahadev Konar <[email protected]> Committed: Thu Sep 5 11:20:30 2013 -0700 ---------------------------------------------------------------------- .../main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7a8c397d/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb b/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb index bd7f5f7..b71a79c 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb +++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/hadoop-env.sh.erb @@ -56,9 +56,7 @@ HADOOP_BALANCER_OPTS="-server -Xmx<%=scope.function_hdp_template_var("hadoop_hea export HADOOP_SECONDARYNAMENODE_OPTS="-server -XX:ParallelGCThreads=8 -XX:+UseConcMarkSweepGC -XX:ErrorFile=<%=scope.function_hdp_template_var("hdfs_log_dir_prefix")%>/$USER/hs_err_pid%p.log -XX:NewSize=<%=scope.function_hdp_template_var("namenode_opt_newsize")%> -XX:MaxNewSize=<%=scope.function_hdp_template_var("namenode_opt_maxnewsize")%> -Xloggc:<%=scope.function_hdp_template_var("hdfs_log_dir_prefix")%>/$USER/gc.log-`date +'%Y%m%d%H%M'` -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps ${HADOOP_NAMENODE_INIT_HEAPSIZE} -Xmx<%=scope.function_hdp_template_var("namenode_heapsize")%> -Dhadoop.security.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT ${HADOOP_SECONDARYNAMENODE_OPTS}" # The following applies to multiple commands (fs, dfs, fsck, distcp etc) -export HADOOP_CLIENT_OPTS="-Xmx128m ${HADOOP_CLIENT_OPTS}" -#HADOOP_JAVA_PLATFORM_OPTS="-XX:-UsePerfData ${HADOOP_JAVA_PLATFORM_OPTS}" - +export HADOOP_CLIENT_OPTS="-Xmx${HADOOP_HEAPSIZE}m $HADOOP_CLIENT_OPTS" # On secure datanodes, user to run the datanode as after dropping privileges export HADOOP_SECURE_DN_USER=<%=scope.function_hdp_template_var("hdfs_user")%>
