Updated Branches: refs/heads/trunk 59076a55f -> 2518fe128
Revert "AMBARI-3158. Ambari Hadoop: Job Summary Log should be configured to log as separate file. (Dmytro Shkvyra via odiachenko)" This reverts commit 57c53df7c105ec966407d1deca8a5f308de23030. Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/2518fe12 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/2518fe12 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/2518fe12 Branch: refs/heads/trunk Commit: 2518fe1286f5b7e61a54f542f02c3cfdfa5bd607 Parents: 59076a5 Author: Mahadev Konar <[email protected]> Authored: Wed Sep 11 14:35:59 2013 -0700 Committer: Mahadev Konar <[email protected]> Committed: Wed Sep 11 14:35:59 2013 -0700 ---------------------------------------------------------------------- .../modules/hdp-hadoop/templates/log4j.properties.erb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/2518fe12/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/log4j.properties.erb ---------------------------------------------------------------------- diff --git a/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/log4j.properties.erb b/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/log4j.properties.erb index b3f6d13..bc8d8b7 100644 --- a/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/log4j.properties.erb +++ b/ambari-agent/src/main/puppet/modules/hdp-hadoop/templates/log4j.properties.erb @@ -169,20 +169,16 @@ log4j.appender.EventCounter=org.apache.hadoop.log.metrics.EventCounter # hadoop.mapreduce.jobsummary.log.file rolled daily: # hadoop.mapreduce.jobsummary.logger=INFO,JSA # -hadoop.mapreduce.jobsummary.logger=<%=scope.function_hdp_default(["mapred-site/mapreduce.reduce.log.level","INFO"])%>,JSA +hadoop.mapreduce.jobsummary.logger=${hadoop.root.logger} hadoop.mapreduce.jobsummary.log.file=hadoop-mapreduce.jobsummary.log log4j.appender.JSA=org.apache.log4j.DailyRollingFileAppender -log4j.appender.JSA.File=<% if (scope.function_hdp_get_major_stack_version([scope.function_hdp_template_var("stack_version")]) >= 2)%><%=scope.function_hdp_template_var("yarn_log_dir_prefix")%>/<%=scope.function_hdp_template_var("yarn_user")%>/${hadoop.mapreduce.jobsummary.log.file}<% else %><%=scope.function_hdp_template_var("hdfs_log_dir_prefix")%>/<%=scope.function_hdp_template_var("mapred_user")%>/${hadoop.mapreduce.jobsummary.log.file}<%end-%>log4j.appender.JSA.layout=org.apache.log4j.PatternLayout +log4j.appender.JSA.File=${hadoop.log.dir}/${hadoop.mapreduce.jobsummary.log.file} +log4j.appender.JSA.layout=org.apache.log4j.PatternLayout log4j.appender.JSA.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p %c{2}: %m%n log4j.appender.JSA.DatePattern=.yyyy-MM-dd -log4j.appender.JSA.layout=org.apache.log4j.PatternLayout -<% if (scope.function_hdp_get_major_stack_version([scope.function_hdp_template_var("stack_version")]) >= 2)%> -log4j.logger.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$ApplicationSummary=${hadoop.mapreduce.jobsummary.logger} -log4j.additivity.org.apache.hadoop.yarn.server.resourcemanager.RMAppManager$ApplicationSummary=false -<% else %> log4j.logger.org.apache.hadoop.mapred.JobInProgress$JobSummary=${hadoop.mapreduce.jobsummary.logger} log4j.additivity.org.apache.hadoop.mapred.JobInProgress$JobSummary=false -<%end-%> + <%=scope.function_hdp_template_var("rca_prefix")%>ambari.jobhistory.database=<%=scope.function_hdp_host("ambari_db_rca_url")%> <%=scope.function_hdp_template_var("rca_prefix")%>ambari.jobhistory.driver=<%=scope.function_hdp_host("ambari_db_rca_driver")%>
