From 354025b6e7acaa897bad79161611f58b9fe65499 Mon Sep 17 00:00:00 2001 From: Eli Collins Date: Mon, 2 Apr 2012 20:04:31 +0000 Subject: [PATCH] MAPREDUCE-4095. TestJobInProgress#testLocality uses a bogus topology. Contributed by Colin Patrick McCabe git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1308519 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/mapred/TestJobInProgress.java | 8 +------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 86b3e5eef52..abc709645a1 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -195,6 +195,9 @@ Release 2.0.0 - UNRELEASED MAPREDUCE-4091. tools testcases failing because of MAPREDUCE-4082 (tucu) + MAPREDUCE-4095. TestJobInProgress#testLocality uses a bogus topology. + (Colin Patrick McCabe via eli) + Release 0.23.3 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java b/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java index ea100aab08f..6b16518e42a 100644 --- a/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java +++ b/hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/mapred/TestJobInProgress.java @@ -354,13 +354,9 @@ public class TestJobInProgress { Node r2n3 = new NodeBase("/default/rack2/node3"); nt.add(r2n3); - Node r2n4 = new NodeBase("/default/rack2/s1/node4"); - nt.add(r2n4); - LOG.debug("r1n1 parent: " + r1n1.getParent() + "\n" + "r1n2 parent: " + r1n2.getParent() + "\n" + - "r2n3 parent: " + r2n3.getParent() + "\n" + - "r2n4 parent: " + r2n4.getParent()); + "r2n3 parent: " + r2n3.getParent()); // Same host assertEquals(0, JobInProgress.getMatchingLevelForNodes(r1n1, r1n1, 3)); @@ -368,8 +364,6 @@ public class TestJobInProgress { assertEquals(1, JobInProgress.getMatchingLevelForNodes(r1n1, r1n2, 3)); // Different rack assertEquals(2, JobInProgress.getMatchingLevelForNodes(r1n1, r2n3, 3)); - // Different rack at different depth - assertEquals(3, JobInProgress.getMatchingLevelForNodes(r1n1, r2n4, 3)); } }