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 sz...@apache.org on 2013/04/27 01:50:19 UTC
svn commit: r1476453 - in
/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common:
CHANGES.txt src/main/docs/ src/main/java/
src/main/java/org/apache/hadoop/net/NetworkTopology.java src/test/core/
Author: szetszwo
Date: Fri Apr 26 23:50:17 2013
New Revision: 1476453
URL: http://svn.apache.org/r1476453
Log:
Merge r1476010 through r1476452 from trunk.
Modified:
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt (props changed)
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/docs/ (props changed)
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/ (props changed)
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/core/ (props changed)
Propchange: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1476010-1476452
Propchange: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1476010-1476452
Propchange: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1476010-1476452
Modified: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java?rev=1476453&r1=1476452&r2=1476453&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java (original)
+++ hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java Fri Apr 26 23:50:17 2013
@@ -446,6 +446,28 @@ public class NetworkTopology {
return getNode(node.getNetworkLocation());
}
+ /**
+ * Given a string representation of a rack, return its children
+ * @param loc a path-like string representation of a rack
+ * @return a newly allocated list with all the node's children
+ */
+ public List<Node> getDatanodesInRack(String loc) {
+ netlock.readLock().lock();
+ try {
+ loc = NodeBase.normalize(loc);
+ if (!NodeBase.ROOT.equals(loc)) {
+ loc = loc.substring(1);
+ }
+ InnerNode rack = (InnerNode) clusterMap.getLoc(loc);
+ if (rack == null) {
+ return null;
+ }
+ return new ArrayList<Node>(rack.getChildren());
+ } finally {
+ netlock.readLock().unlock();
+ }
+ }
+
/** Remove a node
* Update node counter and rack counter if necessary
* @param node node to be removed; can be null
Propchange: hadoop/common/branches/HDFS-2802/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1476010-1476452