Repository: hadoop Updated Branches: refs/heads/branch-2 d17a7bbf6 -> 3074d7082
MAPREDUCE-6426. TestShuffleHandler#testGetMapOutputInfo is failing. Contributed by zhihai xu. (cherry picked from commit fffb15bb431fcdd7ca4ce0e249f9d45f4968497b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3074d708 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3074d708 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3074d708 Branch: refs/heads/branch-2 Commit: 3074d7082e779c1f32c60401887186776a61bdaf Parents: d17a7bb Author: Devaraj K <deva...@apache.org> Authored: Thu Jul 9 15:00:26 2015 +0530 Committer: Devaraj K <deva...@apache.org> Committed: Thu Jul 9 15:02:09 2015 +0530 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../test/java/org/apache/hadoop/mapred/TestShuffleHandler.java | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3074d708/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index bfd5b75..154a98f 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -281,6 +281,9 @@ Release 2.7.2 - UNRELEASED MAPREDUCE-6425. ShuffleHandler passes wrong "base" parameter to getMapOutputInfo if mapId is not in the cache. (zhihai xu via devaraj) + MAPREDUCE-6426. TestShuffleHandler#testGetMapOutputInfo is failing. + (zhihai xu via devaraj) + Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/3074d708/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/test/java/org/apache/hadoop/mapred/TestShuffleHandler.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/test/java/org/apache/hadoop/mapred/TestShuffleHandler.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/test/java/org/apache/hadoop/mapred/TestShuffleHandler.java index 35d9bdd..878bc87 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/test/java/org/apache/hadoop/mapred/TestShuffleHandler.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/test/java/org/apache/hadoop/mapred/TestShuffleHandler.java @@ -837,6 +837,9 @@ public class TestShuffleHandler { Configuration conf = new Configuration(); conf.setInt(ShuffleHandler.SHUFFLE_PORT_CONFIG_KEY, 0); conf.setInt(ShuffleHandler.MAX_SHUFFLE_CONNECTIONS, 3); + conf.set(CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION, + "simple"); + UserGroupInformation.setConfiguration(conf); File absLogDir = new File("target", TestShuffleHandler.class. getSimpleName() + "LocDir").getAbsoluteFile(); conf.set(YarnConfiguration.NM_LOCAL_DIRS, absLogDir.getAbsolutePath()); @@ -924,7 +927,8 @@ public class TestShuffleHandler { } catch (EOFException e) { // ignore } - Assert.assertEquals(failures.size(), 0); + Assert.assertEquals("sendError called due to shuffle error", + 0, failures.size()); } finally { shuffleHandler.stop(); FileUtil.fullyDelete(absLogDir);
