From cfeaf4cd093a83db5c84ce04a4438a2a60663df9 Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Fri, 15 Aug 2014 05:50:00 +0000 Subject: [PATCH] HADOOP-10964. Small fix for NetworkTopologyWithNodeGroup#sortByDistance. Contributed by Yi Liu. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1618103 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 46784c1712..8cd6a359f2 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -594,6 +594,9 @@ Release 2.6.0 - UNRELEASED HADOOP-10843. TestGridmixRecord unit tests failure on PowerPC (Jinghui Wang via Colin Patrick McCabe) + HADOOP-10964. Small fix for NetworkTopologyWithNodeGroup#sortByDistance. + (Yi Liu via wang) + Release 2.5.0 - UNRELEASED INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java index 86d290abd6..cc598c0986 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java @@ -293,7 +293,7 @@ public void sortByDistance(Node reader, Node[] nodes, int activeLen, return; } } - super.sortByDistance(reader, nodes, nodes.length, seed, + super.sortByDistance(reader, nodes, activeLen, seed, randomizeBlockLocationsPerBlock); }