You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by od...@apache.org on 2013/09/20 18:18:17 UTC
git commit: Revert "AMBARI-3158. Ambari Hadoop: Job Summary Log
should be configured to log as separate file(Dmytro Shkvyra via odiachenko)"
Updated Branches:
refs/heads/trunk 7e2332774 -> dcbdd9be1
Revert "AMBARI-3158. Ambari Hadoop: Job Summary Log should be configured to log as separate file(Dmytro Shkvyra via odiachenko)"
This reverts commit 99983453b24b4d3435c82f4b63969a148fd4678f.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/dcbdd9be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/dcbdd9be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/dcbdd9be
Branch: refs/heads/trunk
Commit: dcbdd9be10d88e135e22801deb9e1a598292028a
Parents: 7e23327
Author: Oleksandr Diachenko <od...@hortonworks.com>
Authored: Fri Sep 20 19:17:45 2013 +0300
Committer: Oleksandr Diachenko <od...@hortonworks.com>
Committed: Fri Sep 20 19:17:45 2013 +0300
----------------------------------------------------------------------
.../hdp-hadoop/templates/log4j.properties.erb | 15 +++------------
.../puppet/modules/hdp-yarn/manifests/service.pp | 13 +++----------
2 files changed, 6 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/dcbdd9be/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 8a7c269..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,25 +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
-<% if (scope.function_hdp_get_major_stack_version([scope.function_hdp_template_var("stack_version")]) >= 2)%>
-log4j.appender.JSA.File=<%=scope.function_hdp_template_var("yarn_log_dir_prefix")%>/<%=scope.function_hdp_template_var("yarn_user")%>/${hadoop.mapreduce.jobsummary.log.file}
-<% else %>
-log4j.appender.JSA.File=<%=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.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")%>
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/dcbdd9be/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp
----------------------------------------------------------------------
diff --git a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp
index 2eb3f35..8b73016 100644
--- a/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp
+++ b/ambari-agent/src/main/puppet/modules/hdp-yarn/manifests/service.pp
@@ -30,17 +30,15 @@ define hdp-yarn::service(
$security_enabled = $hdp::params::security_enabled
if ($name == 'historyserver') {
- $log_dir = "${hdp-yarn::params::mapred_log_dir_prefix}/${user}"
+ $log_dir = "${hdp-yarn::params::mapred_log_dir_prefix}"
$pid_dir = "${hdp-yarn::params::mapred_pid_dir_prefix}/${user}"
$daemon = "${hdp::params::mapred_bin}/mr-jobhistory-daemon.sh"
$pid_file = "${pid_dir}/mapred-${user}-${name}.pid"
- $job_summary_log = "${hdp-yarn::params::mapred_log_dir_prefix}/${user}/hadoop-mapreduce.jobsummary.log"
} else {
- $log_dir = "${hdp-yarn::params::yarn_log_dir_prefix}/${user}"
+ $log_dir = "${hdp-yarn::params::yarn_log_dir_prefix}"
$pid_dir = "${hdp-yarn::params::yarn_pid_dir_prefix}/${user}"
$daemon = "${hdp::params::yarn_bin}/yarn-daemon.sh"
$pid_file = "${pid_dir}/yarn-${user}-${name}.pid"
- $job_summary_log = "${hdp-yarn::params::yarn_log_dir_prefix}/${user}/hadoop-mapreduce.jobsummary.log"
}
$hadoop_libexec_dir = $hdp-yarn::params::hadoop_libexec_dir
@@ -81,11 +79,6 @@ define hdp-yarn::service(
service_state => $ensure,
force => true
}
-
- file {$job_summary_log:
- path => $job_summary_log,
- owner => $user,
- }
}
if ($daemon_cmd != undef) {
@@ -99,7 +92,7 @@ define hdp-yarn::service(
anchor{"hdp-yarn::service::${name}::begin":}
anchor{"hdp-yarn::service::${name}::end":}
if ($daemon_cmd != undef) {
- Anchor["hdp-yarn::service::${name}::begin"] -> Hdp::Directory_recursive_create<|title == $pid_dir or title == $log_dir|> -> File[$job_summary_log] -> Hdp::Exec[$daemon_cmd] -> Anchor["hdp-yarn::service::${name}::end"]
+ Anchor["hdp-yarn::service::${name}::begin"] -> Hdp::Directory_recursive_create<|title == $pid_dir or title == $log_dir|> -> Hdp::Exec[$daemon_cmd] -> Anchor["hdp-yarn::service::${name}::end"]
}
if ($ensure == 'running') {