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 cm...@apache.org on 2013/06/27 03:22:43 UTC
svn commit: r1497176 - in
/hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt
src/main/java/org/apache/hadoop/net/NetworkTopology.java
Author: cmccabe
Date: Thu Jun 27 01:22:43 2013
New Revision: 1497176
URL: http://svn.apache.org/r1497176
Log:
HADOOP-9673. NetworkTopology: When a node cannot be added, print out its location for diagnostic purposes
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1497176&r1=1497175&r2=1497176&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jun 27 01:22:43 2013
@@ -303,6 +303,9 @@ Release 2.2.0 - UNRELEASED
HADOOP-9355. Abstract symlink tests to use either FileContext or
FileSystem. (Andrew Wang via Colin Patrick McCabe)
+ HADOOP-9673. NetworkTopology: when a node can't be added, print out its
+ location for diagnostic purposes. (Colin Patrick McCabe)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java?rev=1497176&r1=1497175&r2=1497176&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java Thu Jun 27 01:22:43 2013
@@ -396,10 +396,10 @@ public class NetworkTopology {
netlock.writeLock().lock();
try {
if ((depthOfAllLeaves != -1) && (depthOfAllLeaves != newDepth)) {
- LOG.error("Error: can't add leaf node at depth " +
- newDepth + " to topology:\n" + oldTopoStr);
- throw new InvalidTopologyException("Invalid network topology. " +
- "You cannot have a rack and a non-rack node at the same " +
+ LOG.error("Error: can't add leaf node " + NodeBase.getPath(node) +
+ " at depth " + newDepth + " to topology:\n" + oldTopoStr);
+ 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.");
}
Node rack = getNodeForNetworkLocation(node);