Author: wang
Date: Tue Jun 3 22:06:11 2014
New Revision: 1599807
URL: http://svn.apache.org/r1599807
Log:
Revert bad HDFS-6268 commit from branch-2
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/ (props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/ (props
changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core/
(props changed)
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetworkTopologyWithNodeGroup.java
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/
------------------------------------------------------------------------------
Reverse-merged /hadoop/common/trunk/hadoop-common-project:r1598746,1599734
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-auth/
------------------------------------------------------------------------------
Reverse-merged
/hadoop/common/trunk/hadoop-common-project/hadoop-auth:r1598746,1599734
Propchange: hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/
------------------------------------------------------------------------------
Reverse-merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common:r1598746,1599734
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Reverse-merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1598746,1599734
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/
------------------------------------------------------------------------------
Reverse-merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src:r1598746,1599734
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/docs/
------------------------------------------------------------------------------
Reverse-merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1598746,1599734
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Reverse-merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1598746,1599734
Modified:
hadoop/common/branches/branch-2/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/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java?rev=1599807&r1=1599806&r2=1599807&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
Tue Jun 3 22:06:11 2014
@@ -20,10 +20,8 @@ package org.apache.hadoop.net;
import java.util.ArrayList;
import java.util.List;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import java.util.Random;
-import java.util.TreeMap;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -35,9 +33,6 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.util.ReflectionUtils;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-
/** The class represents a cluster of computer with a tree hierarchical
* network topology.
* For example, a cluster may be consists of many data centers filled
@@ -673,23 +668,7 @@ public class NetworkTopology {
return node1.getParent()==node2.getParent();
}
- private static final ThreadLocal<Random> r = new ThreadLocal<Random>();
-
- /**
- * Getter for thread-local Random, which provides better performance than
- * a shared Random (even though Random is thread-safe).
- *
- * @return Thread-local Random.
- */
- protected Random getRandom() {
- Random rand = r.get();
- if (rand == null) {
- rand = new Random();
- r.set(rand);
- }
- return rand;
- }
-
+ final protected static Random r = new Random();
/** randomly choose one node from <i>scope</i>
* if scope starts with ~, choose one from the all nodes except for the
* ones in <i>scope</i>; otherwise, choose one from <i>scope</i>
@@ -739,7 +718,7 @@ public class NetworkTopology {
"Failed to find datanode (scope=\"" + String.valueOf(scope) +
"\" excludedScope=\"" + String.valueOf(excludedScope) + "\").");
}
- int leaveIndex = getRandom().nextInt(numOfDatanodes);
+ int leaveIndex = r.nextInt(numOfDatanodes);
return innerNode.getLeaf(leaveIndex, node);
}
@@ -846,79 +825,61 @@ public class NetworkTopology {
return networkLocation.substring(index);
}
- /**
- * Returns an integer weight which specifies how far away {node} is away from
- * {reader}. A lower value signifies that a node is closer.
- *
- * @param reader Node where data will be read
- * @param node Replica of data
- * @return weight
- */
- protected int getWeight(Node reader, Node node) {
- // 0 is local, 1 is same rack, 2 is off rack
- // Start off by initializing to off rack
- int weight = 2;
- if (reader != null) {
- if (reader == node) {
- weight = 0;
- } else if (isOnSameRack(reader, node)) {
- weight = 1;
- }
- }
- return weight;
+ /** swap two array items */
+ static protected void swap(Node[] nodes, int i, int j) {
+ Node tempNode;
+ tempNode = nodes[j];
+ nodes[j] = nodes[i];
+ nodes[i] = tempNode;
}
-
- /**
- * Sort nodes array by network distance to <i>reader</i>.
- * <p/>
- * In a three-level topology, a node can be either local, on the same rack,
or
- * on a different rack from the reader. Sorting the nodes based on network
- * distance from the reader reduces network traffic and improves performance.
- * <p/>
- * As an additional twist, we also randomize the nodes at each network
- * distance using the provided random seed. This helps with load balancing
- * when there is data skew.
- *
- * @param reader Node where data will be read
- * @param nodes Available replicas with the requested data
- * @param seed Used to seed the pseudo-random generator that randomizes the
- * set of nodes at each network distance.
- */
- public void sortByDistance(Node reader, Node[] nodes, long seed) {
- /** Sort weights for the nodes array */
- int[] weights = new int[nodes.length];
- for (int i=0; i<nodes.length; i++) {
- weights[i] = getWeight(reader, nodes[i]);
- }
- // Add weight/node pairs to a TreeMap to sort
- TreeMap<Integer, List<Node>> tree = new TreeMap<Integer, List<Node>>();
- for (int i=0; i<nodes.length; i++) {
- int weight = weights[i];
- Node node = nodes[i];
- List<Node> list = tree.get(weight);
- if (list == null) {
- list = Lists.newArrayListWithExpectedSize(1);
- tree.put(weight, list);
- }
- list.add(node);
- }
-
- // Seed is normally the block id
- // This means we use the same pseudo-random order for each block, for
- // potentially better page cache usage.
- Random rand = getRandom();
- rand.setSeed(seed);
- int idx = 0;
- for (List<Node> list: tree.values()) {
- if (list != null) {
- Collections.shuffle(list, rand);
- for (Node n: list) {
- nodes[idx] = n;
- idx++;
+
+ /** Sort nodes array by their distances to <i>reader</i>
+ * It linearly scans the array, if a local node is found, swap it with
+ * the first element of the array.
+ * If a local rack node is found, swap it with the first element following
+ * the local node.
+ * If neither local node or local rack node is found, put a random replica
+ * location at position 0.
+ * It leaves the rest nodes untouched.
+ * @param reader the node that wishes to read a block from one of the nodes
+ * @param nodes the list of nodes containing data for the reader
+ */
+ public void pseudoSortByDistance( Node reader, Node[] nodes ) {
+ int tempIndex = 0;
+ int localRackNode = -1;
+ if (reader != null ) {
+ //scan the array to find the local node & local rack node
+ for(int i=0; i<nodes.length; i++) {
+ if(tempIndex == 0 && reader == nodes[i]) { //local node
+ //swap the local node and the node at position 0
+ if( i != 0 ) {
+ swap(nodes, tempIndex, i);
+ }
+ tempIndex=1;
+ if(localRackNode != -1 ) {
+ if(localRackNode == 0) {
+ localRackNode = i;
+ }
+ break;
+ }
+ } else if(localRackNode == -1 && isOnSameRack(reader, nodes[i])) {
+ //local rack
+ localRackNode = i;
+ if(tempIndex != 0 ) break;
}
}
+
+ // swap the local rack node and the node at position tempIndex
+ if(localRackNode != -1 && localRackNode != tempIndex ) {
+ swap(nodes, tempIndex, localRackNode);
+ tempIndex++;
+ }
+ }
+
+ // put a random node at position 0 if it is not a local/local-rack node
+ if(tempIndex == 0 && localRackNode == -1 && nodes.length != 0) {
+ swap(nodes, 0, r.nextInt(nodes.length));
}
- Preconditions.checkState(idx == nodes.length,
- "Sorted the wrong number of nodes!");
}
+
}
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java?rev=1599807&r1=1599806&r2=1599807&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java
Tue Jun 3 22:06:11 2014
@@ -248,41 +248,25 @@ public class NetworkTopologyWithNodeGrou
}
}
- @Override
- protected int getWeight(Node reader, Node node) {
- // 0 is local, 1 is same node group, 2 is same rack, 3 is off rack
- // Start off by initializing to off rack
- int weight = 3;
- if (reader != null) {
- if (reader == node) {
- weight = 0;
- } else if (isOnSameNodeGroup(reader, node)) {
- weight = 1;
- } else if (isOnSameRack(reader, node)) {
- weight = 2;
- }
- }
- return weight;
- }
-
- /**
- * Sort nodes array by their distances to <i>reader</i>.
- * <p/>
- * This is the same as
- * {@link NetworkTopology#sortByDistance(Node, Node[], long)} except with a
- * four-level network topology which contains the additional network distance
- * of a "node group" which is between local and same rack.
- *
- * @param reader Node where data will be read
- * @param nodes Available replicas with the requested data
- * @param seed Used to seed the pseudo-random generator that randomizes the
- * set of nodes at each network distance.
+ /** Sort nodes array by their distances to <i>reader</i>
+ * It linearly scans the array, if a local node is found, swap it with
+ * the first element of the array.
+ * If a local node group node is found, swap it with the first element
+ * following the local node.
+ * If a local rack node is found, swap it with the first element following
+ * the local node group node.
+ * If neither local node, node group node or local rack node is found, put a
+ * random replica location at position 0.
+ * It leaves the rest nodes untouched.
+ * @param reader the node that wishes to read a block from one of the nodes
+ * @param nodes the list of nodes containing data for the reader
*/
@Override
- public void sortByDistance( Node reader, Node[] nodes, long seed) {
- // If reader is not a datanode (not in NetworkTopology tree), we need to
- // replace this reader with a sibling leaf node in tree.
+ public void pseudoSortByDistance( Node reader, Node[] nodes ) {
+
if (reader != null && !this.contains(reader)) {
+ // if reader is not a datanode (not in NetworkTopology tree), we will
+ // replace this reader with a sibling leaf node in tree.
Node nodeGroup = getNode(reader.getNetworkLocation());
if (nodeGroup != null && nodeGroup instanceof InnerNode) {
InnerNode parentNode = (InnerNode) nodeGroup;
@@ -292,7 +276,62 @@ public class NetworkTopologyWithNodeGrou
return;
}
}
- super.sortByDistance(reader, nodes, seed);
+ int tempIndex = 0;
+ int localRackNode = -1;
+ int localNodeGroupNode = -1;
+ if (reader != null) {
+ //scan the array to find the local node & local rack node
+ for (int i = 0; i < nodes.length; i++) {
+ if (tempIndex == 0 && reader == nodes[i]) { //local node
+ //swap the local node and the node at position 0
+ if (i != 0) {
+ swap(nodes, tempIndex, i);
+ }
+ tempIndex=1;
+
+ if (localRackNode != -1 && (localNodeGroupNode !=-1)) {
+ if (localRackNode == 0) {
+ localRackNode = i;
+ }
+ if (localNodeGroupNode == 0) {
+ localNodeGroupNode = i;
+ }
+ break;
+ }
+ } else if (localNodeGroupNode == -1 && isOnSameNodeGroup(reader,
+ nodes[i])) {
+ //local node group
+ localNodeGroupNode = i;
+ // node local and rack local are already found
+ if(tempIndex != 0 && localRackNode != -1) break;
+ } else if (localRackNode == -1 && isOnSameRack(reader, nodes[i])) {
+ localRackNode = i;
+ if (tempIndex != 0 && localNodeGroupNode != -1) break;
+ }
+ }
+
+ // swap the local nodegroup node and the node at position tempIndex
+ if(localNodeGroupNode != -1 && localNodeGroupNode != tempIndex) {
+ swap(nodes, tempIndex, localNodeGroupNode);
+ if (localRackNode == tempIndex) {
+ localRackNode = localNodeGroupNode;
+ }
+ tempIndex++;
+ }
+
+ // swap the local rack node and the node at position tempIndex
+ if(localRackNode != -1 && localRackNode != tempIndex) {
+ swap(nodes, tempIndex, localRackNode);
+ tempIndex++;
+ }
+ }
+
+ // put a random node at position 0 if there is not a local/local-nodegroup/
+ // local-rack node
+ if (tempIndex == 0 && localNodeGroupNode == -1 && localRackNode == -1
+ && nodes.length != 0) {
+ swap(nodes, 0, r.nextInt(nodes.length));
+ }
}
/** InnerNodeWithNodeGroup represents a switch/router of a data center, rack
Propchange:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/core/
------------------------------------------------------------------------------
Reverse-merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1598746,1599734
Modified:
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetworkTopologyWithNodeGroup.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetworkTopologyWithNodeGroup.java?rev=1599807&r1=1599806&r2=1599807&view=diff
==============================================================================
---
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetworkTopologyWithNodeGroup.java
(original)
+++
hadoop/common/branches/branch-2/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetworkTopologyWithNodeGroup.java
Tue Jun 3 22:06:11 2014
@@ -96,7 +96,7 @@ public class TestNetworkTopologyWithNode
}
@Test
- public void testSortByDistance() throws Exception {
+ public void testPseudoSortByDistance() throws Exception {
NodeBase[] testNodes = new NodeBase[4];
// array contains both local node, local node group & local rack node
@@ -104,7 +104,7 @@ public class TestNetworkTopologyWithNode
testNodes[1] = dataNodes[2];
testNodes[2] = dataNodes[3];
testNodes[3] = dataNodes[0];
- cluster.sortByDistance(dataNodes[0], testNodes, 0xDEADBEEF);
+ cluster.pseudoSortByDistance(dataNodes[0], testNodes );
assertTrue(testNodes[0] == dataNodes[0]);
assertTrue(testNodes[1] == dataNodes[1]);
assertTrue(testNodes[2] == dataNodes[2]);
@@ -115,7 +115,7 @@ public class TestNetworkTopologyWithNode
testNodes[1] = dataNodes[4];
testNodes[2] = dataNodes[1];
testNodes[3] = dataNodes[0];
- cluster.sortByDistance(dataNodes[0], testNodes, 0xDEADBEEF);
+ cluster.pseudoSortByDistance(dataNodes[0], testNodes );
assertTrue(testNodes[0] == dataNodes[0]);
assertTrue(testNodes[1] == dataNodes[1]);
@@ -124,7 +124,7 @@ public class TestNetworkTopologyWithNode
testNodes[1] = dataNodes[3];
testNodes[2] = dataNodes[2];
testNodes[3] = dataNodes[0];
- cluster.sortByDistance(dataNodes[0], testNodes, 0xDEADBEEF);
+ cluster.pseudoSortByDistance(dataNodes[0], testNodes );
assertTrue(testNodes[0] == dataNodes[0]);
assertTrue(testNodes[1] == dataNodes[2]);
@@ -133,7 +133,7 @@ public class TestNetworkTopologyWithNode
testNodes[1] = dataNodes[7];
testNodes[2] = dataNodes[2];
testNodes[3] = dataNodes[0];
- cluster.sortByDistance(computeNode, testNodes, 0xDEADBEEF);
+ cluster.pseudoSortByDistance(computeNode, testNodes );
assertTrue(testNodes[0] == dataNodes[0]);
assertTrue(testNodes[1] == dataNodes[2]);
}
