MAPREDUCE-2251. Remove unused mapreduce.job.userhistorylocation config. Contributed by Harsh J Chouraria.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@1078668 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 5a68932..4d337b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -613,6 +613,9 @@
MAPREDUCE-2241. ClusterWithLinuxTaskController should accept relative path
on the command line. (todd)
+ MAPREDUCE-2251. Remove unused mapreduce.job.userhistorylocation config.
+ (Harsh J Chouraria via todd)
+
Release 0.21.1 - Unreleased
NEW FEATURES
diff --git a/src/java/mapred-default.xml b/src/java/mapred-default.xml
index 35665b9..f47b07b 100644
--- a/src/java/mapred-default.xml
+++ b/src/java/mapred-default.xml
@@ -33,16 +33,6 @@
</property>
<property>
- <name>mapreduce.job.userhistorylocation</name>
- <value></value>
- <description> User can specify a location to store the history files of
- a particular job. If nothing is specified, the logs are stored in
- output directory. The files are stored in "_logs/history/" in the directory.
- User can stop logging by giving the value "none".
- </description>
-</property>
-
-<property>
<name>mapreduce.jobtracker.jobhistory.completed.location</name>
<value></value>
<description> The completed job history files are stored at this single well
diff --git a/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java b/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java
index 1a686c4..a3ec081 100644
--- a/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java
+++ b/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java
@@ -90,8 +90,6 @@
public static final String WORKING_DIR = "mapreduce.job.working.dir";
- public static final String HISTORY_LOCATION = "mapreduce.job.userhistorylocation";
-
public static final String END_NOTIFICATION_URL = "mapreduce.job.end-notification.url";
public static final String END_NOTIFICATION_RETRIES = "mapreduce.job.end-notification.retry.attempts";
diff --git a/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java b/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
index fb20212..d3348a2 100644
--- a/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
+++ b/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
@@ -174,8 +174,6 @@
new String[] {TTConfig.TT_LOCAL_CACHE_SIZE});
Configuration.addDeprecation("tasktracker.contention.tracking",
new String[] {TTConfig.TT_CONTENTION_TRACKING});
- Configuration.addDeprecation("hadoop.job.history.user.location",
- new String[] {MRJobConfig.HISTORY_LOCATION});
Configuration.addDeprecation("job.end.notification.url",
new String[] {MRJobConfig.END_NOTIFICATION_URL});
Configuration.addDeprecation("job.end.retry.attempts",
@@ -250,8 +248,6 @@
new String[] {MRJobConfig.CACHE_SYMLINK});
Configuration.addDeprecation("mapred.working.dir",
new String[] {MRJobConfig.WORKING_DIR});
- Configuration.addDeprecation("hadoop.job.history.user.location",
- new String[] {MRJobConfig.HISTORY_LOCATION});
Configuration.addDeprecation("user.name",
new String[] {MRJobConfig.USER_NAME});
Configuration.addDeprecation("mapred.output.key.class",
diff --git a/src/test/mapred/org/apache/hadoop/mapred/TestSeveral.java b/src/test/mapred/org/apache/hadoop/mapred/TestSeveral.java
index b735f6b..1310679 100644
--- a/src/test/mapred/org/apache/hadoop/mapred/TestSeveral.java
+++ b/src/test/mapred/org/apache/hadoop/mapred/TestSeveral.java
@@ -342,8 +342,6 @@
conf.setLong(JobContext.MAP_MAX_ATTEMPTS, 1);
- conf.set(JobContext.HISTORY_LOCATION, "none");
-
conf.setNumReduceTasks(0);
final Path inDir = new Path("./wc/input");
@@ -397,8 +395,6 @@
final Path outDir = new Path("./wc/output");
final Path histDir = new Path("./wc/history");
- conf.set(JobContext.HISTORY_LOCATION, histDir.toString());
-
FileInputFormat.setInputPaths(conf, inDir);
FileOutputFormat.setOutputPath(conf, outDir);
diff --git a/src/tools/org/apache/hadoop/tools/HadoopArchives.java b/src/tools/org/apache/hadoop/tools/HadoopArchives.java
index a3bb25c..f7ea393 100644
--- a/src/tools/org/apache/hadoop/tools/HadoopArchives.java
+++ b/src/tools/org/apache/hadoop/tools/HadoopArchives.java
@@ -545,7 +545,6 @@
conf.setReducerClass(HArchivesReducer.class);
conf.setMapOutputKeyClass(IntWritable.class);
conf.setMapOutputValueClass(Text.class);
- conf.set(MRJobConfig.HISTORY_LOCATION, "none");
FileInputFormat.addInputPath(conf, jobDirectory);
//make sure no speculative execution is done
conf.setSpeculativeExecution(false);
