Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-13921. Remove log4j classes from JobConf. 

Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
This commit is contained in:
Sean Busbey 2017-05-04 11:16:25 -05:00 committed by Akira Ajisaka
parent 6e6e96583f
commit f5517a8200
No known key found for this signature in database
GPG Key ID: C1EDBB9CA400FD50
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hadoop-client-modules/hadoop-client-runtime/pom.xml
View File

@ -96,7 +96,6 @@
</dependency> </dependency>
<!-- Move log4j to optional, since it is needed for some pieces folks might not use: <!-- Move log4j to optional, since it is needed for some pieces folks might not use:
* one of the three custom log4j appenders we have * one of the three custom log4j appenders we have
* JobConf (?!) (so essentially any user of MapReduce)
--> -->
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapreduce/v2/util/MRApps.java
View File

@ -650,12 +650,12 @@ public static String getChildLogLevel(Configuration conf, boolean isMap) {
if (isMap) { if (isMap) {
return conf.get( return conf.get(
MRJobConfig.MAP_LOG_LEVEL, MRJobConfig.MAP_LOG_LEVEL,
JobConf.DEFAULT_LOG_LEVEL.toString() JobConf.DEFAULT_LOG_LEVEL
); );
} else { } else {
return conf.get( return conf.get(
MRJobConfig.REDUCE_LOG_LEVEL, MRJobConfig.REDUCE_LOG_LEVEL,
JobConf.DEFAULT_LOG_LEVEL.toString() JobConf.DEFAULT_LOG_LEVEL
); );
} }
} }

7
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobConf.java
View File

@ -53,7 +53,6 @@
import org.apache.hadoop.util.ClassUtil; import org.apache.hadoop.util.ClassUtil;
import org.apache.hadoop.util.ReflectionUtils; import org.apache.hadoop.util.ReflectionUtils;
import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.Tool;
import org.apache.log4j.Level;
/** /**
* A map/reduce job configuration. * A map/reduce job configuration.
@ -333,7 +332,7 @@ public class JobConf extends Configuration {
private Credentials credentials = new Credentials(); 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: * The allowed logging levels are:
* OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE and ALL. * OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE and ALL.
@ -342,7 +341,7 @@ public class JobConf extends Configuration {
JobContext.MAP_LOG_LEVEL; 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: * The allowed logging levels are:
* OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE and ALL. * 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. * 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 * The variable is kept for M/R 1.x applications, M/R 2.x applications should