HADOOP-13921. Remove log4j classes from JobConf. Signed-off-by: Akira Ajisaka <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f5517a82 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f5517a82 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f5517a82 Branch: refs/heads/HADOOP-13345 Commit: f5517a82001eea2207a93d3b70d42ad8f4ddeccb Parents: 6e6e965 Author: Sean Busbey <[email protected]> Authored: Thu May 4 11:16:25 2017 -0500 Committer: Akira Ajisaka <[email protected]> Committed: Thu Jun 1 13:35:14 2017 +0900 ---------------------------------------------------------------------- hadoop-client-modules/hadoop-client-runtime/pom.xml | 1 - .../main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java | 4 ++-- .../src/main/java/org/apache/hadoop/mapred/JobConf.java | 7 +++---- 3 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f5517a82/hadoop-client-modules/hadoop-client-runtime/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-client-modules/hadoop-client-runtime/pom.xml b/hadoop-client-modules/hadoop-client-runtime/pom.xml index dc0f005..3c8364c 100644 --- a/hadoop-client-modules/hadoop-client-runtime/pom.xml +++ b/hadoop-client-modules/hadoop-client-runtime/pom.xml @@ -96,7 +96,6 @@ </dependency> <!-- Move log4j to optional, since it is needed for some pieces folks might not use: * one of the three custom log4j appenders we have - * JobConf (?!) (so essentially any user of MapReduce) --> <dependency> <groupId>log4j</groupId> http://git-wip-us.apache.org/repos/asf/hadoop/blob/f5517a82/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java index 5fd66ac..a43da65 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java @@ -650,12 +650,12 @@ public class MRApps extends Apps { if (isMap) { return conf.get( MRJobConfig.MAP_LOG_LEVEL, - JobConf.DEFAULT_LOG_LEVEL.toString() + JobConf.DEFAULT_LOG_LEVEL ); } else { return conf.get( MRJobConfig.REDUCE_LOG_LEVEL, - JobConf.DEFAULT_LOG_LEVEL.toString() + JobConf.DEFAULT_LOG_LEVEL ); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/f5517a82/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobConf.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobConf.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobConf.java index f286a96..be8fa9e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobConf.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobConf.java @@ -53,7 +53,6 @@ import org.apache.hadoop.security.Credentials; import org.apache.hadoop.util.ClassUtil; import org.apache.hadoop.util.ReflectionUtils; import org.apache.hadoop.util.Tool; -import org.apache.log4j.Level; /** * A map/reduce job configuration. @@ -333,7 +332,7 @@ public class JobConf extends Configuration { private Credentials credentials = new Credentials(); /** - * Configuration key to set the logging {@link Level} for the map task. + * Configuration key to set the logging level for the map task. * * The allowed logging levels are: * OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE and ALL. @@ -342,7 +341,7 @@ public class JobConf extends Configuration { JobContext.MAP_LOG_LEVEL; /** - * Configuration key to set the logging {@link Level} for the reduce task. + * Configuration key to set the logging level for the reduce task. * * The allowed logging levels are: * OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE and ALL. @@ -353,7 +352,7 @@ public class JobConf extends Configuration { /** * Default logging level for map/reduce tasks. */ - public static final Level DEFAULT_LOG_LEVEL = Level.INFO; + public static final String DEFAULT_LOG_LEVEL = JobContext.DEFAULT_LOG_LEVEL; /** * The variable is kept for M/R 1.x applications, M/R 2.x applications should --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
