You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by to...@apache.org on 2011/03/07 04:39:42 UTC
svn commit: r1078668 - in /hadoop/mapreduce/trunk: ./ src/java/
src/java/org/apache/hadoop/mapreduce/
src/java/org/apache/hadoop/mapreduce/util/
src/test/mapred/org/apache/hadoop/mapred/ src/tools/org/apache/hadoop/tools/
Author: todd
Date: Mon Mar 7 03:39:41 2011
New Revision: 1078668
URL: http://svn.apache.org/viewvc?rev=1078668&view=rev
Log:
MAPREDUCE-2251. Remove unused mapreduce.job.userhistorylocation config. Contributed by Harsh J Chouraria.
Modified:
hadoop/mapreduce/trunk/CHANGES.txt
hadoop/mapreduce/trunk/src/java/mapred-default.xml
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java
hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestSeveral.java
hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/HadoopArchives.java
Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1078668&r1=1078667&r2=1078668&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Mon Mar 7 03:39:41 2011
@@ -613,6 +613,9 @@ Release 0.22.0 - Unreleased
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
Modified: hadoop/mapreduce/trunk/src/java/mapred-default.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/mapred-default.xml?rev=1078668&r1=1078667&r2=1078668&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/mapred-default.xml (original)
+++ hadoop/mapreduce/trunk/src/java/mapred-default.xml Mon Mar 7 03:39:41 2011
@@ -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
Modified: hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java?rev=1078668&r1=1078667&r2=1078668&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java (original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/MRJobConfig.java Mon Mar 7 03:39:41 2011
@@ -90,8 +90,6 @@ public interface MRJobConfig {
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";
Modified: hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java?rev=1078668&r1=1078667&r2=1078668&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java (original)
+++ hadoop/mapreduce/trunk/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java Mon Mar 7 03:39:41 2011
@@ -174,8 +174,6 @@ public class ConfigUtil {
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 @@ public class ConfigUtil {
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",
Modified: hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestSeveral.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestSeveral.java?rev=1078668&r1=1078667&r2=1078668&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestSeveral.java (original)
+++ hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/mapred/TestSeveral.java Mon Mar 7 03:39:41 2011
@@ -342,8 +342,6 @@ public class TestSeveral extends TestCas
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 @@ public class TestSeveral extends TestCas
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);
Modified: hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/HadoopArchives.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/HadoopArchives.java?rev=1078668&r1=1078667&r2=1078668&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/HadoopArchives.java (original)
+++ hadoop/mapreduce/trunk/src/tools/org/apache/hadoop/tools/HadoopArchives.java Mon Mar 7 03:39:41 2011
@@ -545,7 +545,6 @@ public class HadoopArchives implements T
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);