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 tu...@apache.org on 2013/07/11 02:10:54 UTC
svn commit: r1502066 - in
/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/java/org/apache/hadoop/net/NetworkTopology.java
Author: tucu
Date: Thu Jul 11 00:10:54 2013
New Revision: 1502066
URL: http://svn.apache.org/r1502066
Log:
HADOOP-9673. NetworkTopology: when a node can't be added, print out its location for diagnostic purposes. (Colin Patrick McCabe)
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1502066&r1=1502065&r2=1502066&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/CHANGES.txt Thu Jul 11 00:10:54 2013
@@ -145,6 +145,9 @@ Release 2.1.0-beta - 2013-07-02
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
HADOOP-9150. Avoid unnecessary DNS resolution attempts for logical URIs
Modified: hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java?rev=1502066&r1=1502065&r2=1502066&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java (original)
+++ hadoop/common/branches/branch-2.1-beta/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java Thu Jul 11 00:10:54 2013
@@ -397,10 +397,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);