You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by sh...@apache.org on 2017/05/11 03:49:42 UTC
hadoop git commit: HADOOP-12173. NetworkTopology::add calls toString
always. Contributed by Inigo Goiri (cherry picked from commit
e59f6fad6a8849cfab6acbf012f338d9cc7dd63c)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 f30484e04 -> db72660f3
HADOOP-12173. NetworkTopology::add calls toString always. Contributed by Inigo Goiri
(cherry picked from commit e59f6fad6a8849cfab6acbf012f338d9cc7dd63c)
# Conflicts:
# hadoop-common-project/hadoop-common/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/db72660f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/db72660f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/db72660f
Branch: refs/heads/branch-2.7
Commit: db72660f3093b0e675420fb5b3b2a21678602c68
Parents: f30484e
Author: Chris Douglas <cd...@apache.org>
Authored: Thu Jul 2 21:39:48 2015 -0700
Committer: Konstantin V Shvachko <sh...@apache.org>
Committed: Wed May 10 20:48:38 2017 -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/db72660f/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 e6863dd..2ddc0c4 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -145,6 +145,9 @@ Release 2.7.4 - UNRELEASED
HADOOP-14100. Upgrade Jsch jar to latest version to fix vulnerability in
old versions. (Vinayakumar B and Brahma Reddy Battula via aajisaka)
+ HADOOP-12173. NetworkTopology::add calls toString always.
+ (Inigo Goiri via cdouglas)
+
Release 2.7.3 - 2016-08-25
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/db72660f/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 573c534..bc7105b 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
@@ -404,14 +404,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.");
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org