You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ha...@apache.org on 2014/12/30 18:43:42 UTC
hadoop git commit: MAPREDUCE-6149. Document override log4j.properties
in MR job. Contributed by Junping Du.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 e25b789b1 -> 6d65e7467
MAPREDUCE-6149. Document override log4j.properties in MR job. Contributed by Junping Du.
(cherry picked from commit 6621c3598e22279cde11eca73cfb5619a8bc8dee)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6d65e746
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6d65e746
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6d65e746
Branch: refs/heads/branch-2
Commit: 6d65e746706e0c5eed0433a00cd0a9fa6c6b1219
Parents: e25b789
Author: Harsh J <ha...@cloudera.com>
Authored: Tue Dec 30 23:12:32 2014 +0530
Committer: Harsh J <ha...@cloudera.com>
Committed: Tue Dec 30 23:13:19 2014 +0530
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../src/main/resources/mapred-default.xml | 15 +++++++++++++++
2 files changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6d65e746/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 6721e56..c5dd74f 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -8,6 +8,9 @@ Release 2.7.0 - UNRELEASED
IMPROVEMENTS
+ MAPREDUCE-6149. Document override log4j.properties in MR job.
+ (Junping Du via harsh)
+
MAPREDUCE-6194. Bubble up final exception in failures during creation
of output collectors (Varun Saxena via harsh)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6d65e746/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
index 3798da7..85aa0e5 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
@@ -581,6 +581,8 @@
<value>INFO</value>
<description>The logging level for the map task. The allowed levels are:
OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE and ALL.
+ The setting here could be overridden if "mapreduce.job.log4j-properties-file"
+ is set.
</description>
</property>
@@ -589,6 +591,8 @@
<value>INFO</value>
<description>The logging level for the reduce task. The allowed levels are:
OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE and ALL.
+ The setting here could be overridden if "mapreduce.job.log4j-properties-file"
+ is set.
</description>
</property>
@@ -1598,6 +1602,17 @@
</description>
</property>
+ <property>
+ <name>mapreduce.job.log4j-properties-file</name>
+ <value></value>
+ <description>Used to override the default settings of log4j in container-log4j.properties
+ for NodeManager. Like container-log4j.properties, it requires certain
+ framework appenders properly defined in this overriden file. The file on the
+ path will be added to distributed cache and classpath. If no-scheme is given
+ in the path, it defaults to point to a log4j file on the local FS.
+ </description>
+ </property>
+
<property>
<name>mapreduce.job.end-notification.max.retry.interval</name>
<value>5000</value>