big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAPREDUCE-4994. Addendum fixing testcases failures. (sandyr via tucu)

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1446042 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Alejandro Abdelnur 2013-02-14 04:22:04 +00:00
parent a96d228f55
commit ab330b33bb
5 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-mapreduce-project/CHANGES.txt
View File

@ -172,6 +172,8 @@ Release 2.0.4-beta - UNRELEASED
MAPREDUCE-5000. Fixes getCounters when speculating by fixing the selection MAPREDUCE-5000. Fixes getCounters when speculating by fixing the selection
of the best attempt for a task. (Jason Lowe via sseth) of the best attempt for a task. (Jason Lowe via sseth)
MAPREDUCE-4994. Addendum fixing testcases failures. (sandyr via tucu)
Release 2.0.3-alpha - 2013-02-06 Release 2.0.3-alpha - 2013-02-06
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-common/src/main/java/org/apache/hadoop/mapred/LocalClientProtocolProvider.java
View File

@ -37,6 +37,10 @@ public ClientProtocol create(Configuration conf) throws IOException {
if (!MRConfig.LOCAL_FRAMEWORK_NAME.equals(framework)) { if (!MRConfig.LOCAL_FRAMEWORK_NAME.equals(framework)) {
return null; return null;
} }
if (conf.get("mapreduce.job.maps") == null) {
conf.setInt("mapreduce.job.maps", 1);
}
return new LocalJobRunner(conf); return new LocalJobRunner(conf);
} }

1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestLineRecordReader.java
View File

@ -98,6 +98,7 @@ public void testCustomRecordDelimiters() throws IOException,
InterruptedException, ClassNotFoundException { InterruptedException, ClassNotFoundException {
Configuration conf = new Configuration(); Configuration conf = new Configuration();
conf.set("textinputformat.record.delimiter", "\t\n"); conf.set("textinputformat.record.delimiter", "\t\n");
conf.setInt("mapreduce.job.maps", 1);
FileSystem localFs = FileSystem.getLocal(conf); FileSystem localFs = FileSystem.getLocal(conf);
// cleanup // cleanup
localFs.delete(workDir, true); localFs.delete(workDir, true);

1
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/lib/TestChainMapReduce.java
View File

@ -82,6 +82,7 @@ public void testChain() throws Exception {
JobConf conf = createJobConf(); JobConf conf = createJobConf();
conf.setBoolean("localFS", isLocalFS()); conf.setBoolean("localFS", isLocalFS());
conf.setInt("mapreduce.job.maps", 1);
cleanFlags(conf); cleanFlags(conf);

22
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestClientProtocolProviderImpls.java
View File

@ -42,24 +42,10 @@ public void testClusterWithLocalClientProvider() throws Exception {
} }
try { conf.set(MRConfig.FRAMEWORK_NAME, "local");
conf.set(MRConfig.FRAMEWORK_NAME, MRConfig.LOCAL_FRAMEWORK_NAME); Cluster cluster = new Cluster(conf);
conf.set(JTConfig.JT_IPC_ADDRESS, "127.0.0.1:0"); assertTrue(cluster.getClient() instanceof LocalJobRunner);
cluster.close();
new Cluster(conf);
fail("Cluster with Local Framework name should use local JT address");
} catch (IOException e) {
}
try {
conf.set(JTConfig.JT_IPC_ADDRESS, "local");
Cluster cluster = new Cluster(conf);
assertTrue(cluster.getClient() instanceof LocalJobRunner);
cluster.close();
} catch (IOException e) {
}
} }
@Test @Test