Author: tucu
Date: Tue Feb 12 20:16:43 2013
New Revision: 1445331
URL: http://svn.apache.org/r1445331
Log:
MAPREDUCE-4994. -jt generic command line option does not work. (sandyr via tucu)
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1445331&r1=1445330&r2=1445331&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Tue
Feb 12 20:16:43 2013
@@ -15,6 +15,8 @@ Release 2.0.4-beta - UNRELEASED
MAPREDUCE-4671. AM does not tell the RM about container requests which are
no longer needed. (Bikas Saha via sseth)
+ MAPREDUCE-4994. -jt generic command line option does not work. (sandyr via
tucu)
+
Release 2.0.3-alpha - 2013-02-06
INCOMPATIBLE CHANGES
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java?rev=1445331&r1=1445330&r2=1445331&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java
Tue Feb 12 20:16:43 2013
@@ -26,7 +26,6 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.mapreduce.MRConfig;
import org.apache.hadoop.mapreduce.protocol.ClientProtocol;
import org.apache.hadoop.mapreduce.protocol.ClientProtocolProvider;
-import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
@InterfaceAudience.Private
public class LocalClientProtocolProvider extends ClientProtocolProvider {
@@ -38,16 +37,7 @@ public class LocalClientProtocolProvider
if (!MRConfig.LOCAL_FRAMEWORK_NAME.equals(framework)) {
return null;
}
- String tracker = conf.get(JTConfig.JT_IPC_ADDRESS, "local");
- if ("local".equals(tracker)) {
- conf.setInt("mapreduce.job.maps", 1);
- return new LocalJobRunner(conf);
- } else {
-
- throw new IOException("Invalid \"" + JTConfig.JT_IPC_ADDRESS
- + "\" configuration value for LocalJobRunner : \""
- + tracker + "\"");
- }
+ return new LocalJobRunner(conf);
}
@Override
