HADOOP-12173. NetworkTopology::add calls toString always. Contributed by Inigo Goiri (cherry picked from commit e59f6fad6a8849cfab6acbf012f338d9cc7dd63c)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f2c0539d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f2c0539d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f2c0539d Branch: refs/heads/branch-2 Commit: f2c0539d382a0a680df6e839705c4565f4d9bac3 Parents: efe9ae9 Author: Chris Douglas <[email protected]> Authored: Thu Jul 2 21:39:48 2015 -0700 Committer: Chris Douglas <[email protected]> Committed: Thu Jul 2 21:49:43 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/net/NetworkTopology.java | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f2c0539d/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 6bf3600..949b3b8 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -430,6 +430,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12164. Fix TestMove and TestFsShellReturnCode failed to get command name using reflection. (lei) + HADOOP-12173. NetworkTopology::add calls toString always. + (Inigo Goiri via cdouglas) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/f2c0539d/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java index b729bda..91410c7 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java @@ -397,14 +397,13 @@ public class NetworkTopology { int newDepth = NodeBase.locationToDepth(node.getNetworkLocation()) + 1; netlock.writeLock().lock(); try { - String oldTopoStr = this.toString(); if( node instanceof InnerNode ) { throw new IllegalArgumentException( "Not allow to add an inner node: "+NodeBase.getPath(node)); } if ((depthOfAllLeaves != -1) && (depthOfAllLeaves != newDepth)) { LOG.error("Error: can't add leaf node " + NodeBase.getPath(node) + - " at depth " + newDepth + " to topology:\n" + oldTopoStr); + " at depth " + newDepth + " to topology:\n" + this.toString()); throw new InvalidTopologyException("Failed to add " + NodeBase.getPath(node) + ": You cannot have a rack and a non-rack node at the same " + "level of the network topology.");
