Author: vinayakumarb
Date: Wed Jun 11 12:20:48 2014
New Revision: 1601869
URL: http://svn.apache.org/r1601869
Log:
Merged revision(s) 1601144-1601868, 1598456-1601149 from hadoop/common/trunk
Modified:
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/CHANGES.txt
(contents, props changed)
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/
(props changed)
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetworkTopologyWithNodeGroup.java
Modified:
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1601869&r1=1601868&r2=1601869&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/CHANGES.txt
(original)
+++
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/CHANGES.txt
Wed Jun 11 12:20:48 2014
@@ -297,9 +297,6 @@ Trunk (Unreleased)
HADOOP-9394. Port findHangingTest.sh from HBase to Hadoop. (Andrew Wang
via atm)
- HADOOP-9099. NetUtils.normalizeHostName fails on domains where
- UnknownHost resolves to an IP address. (Ivan Mitic via suresh)
-
HADOOP-9431 TestSecurityUtil#testLocalHostNameForNullOrWild on systems
where hostname
contains capital letters (Chris Nauroth via sanjay)
@@ -373,6 +370,11 @@ Release 2.5.0 - UNRELEASED
HADOOP-9704. Write metrics sink plugin for Hadoop/Graphite (Chu Tong, Alex
Newman and Babak Behzad via raviprak)
+ HADOOP-9629. Support Windows Azure Storage - Blob as a file system in
Hadoop.
+ (Dexter Bradshaw, Mostafa Elhemali, Xi Fang, Johannes Klein, David Lao,
+ Mike Liddell, Chuan Liu, Lengning Liu, Ivan Mitic, Michael Rys,
+ Alexander Stojanovic, Brian Swan, and Min Wei via cnauroth)
+
IMPROVEMENTS
HADOOP-10451. Remove unused field and imports from SaslRpcServer.
@@ -429,6 +431,10 @@ Release 2.5.0 - UNRELEASED
HADOOP-10448. Support pluggable mechanism to specify proxy user settings.
(Benoy Antony via Arpit Agarwal)
+ HADOOP-9555. HA functionality that uses ZooKeeper may experience
inadvertent
+ TCP RST and miss session expiration event due to bug in client connection
+ management. (cnauroth)
+
OPTIMIZATIONS
BUG FIXES
@@ -536,6 +542,11 @@ Release 2.5.0 - UNRELEASED
HADOOP-10647. String Format Exception in SwiftNativeFileSystemStore.java.
(Gene Kim via stevel)
+ HADOOP-9099. NetUtils.normalizeHostName fails on domains where
+ UnknownHost resolves to an IP address. (Ivan Mitic via suresh)
+
+ HADOOP-10664. TestNetUtils.testNormalizeHostName fails. (atm)
+
Release 2.4.1 - UNRELEASED
INCOMPATIBLE CHANGES
Propchange:
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1601151-1601868
Propchange:
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1601151-1601868
Modified:
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java?rev=1601869&r1=1601868&r2=1601869&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
(original)
+++
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopology.java
Wed Jun 11 12:20:48 2014
@@ -883,15 +883,16 @@ public class NetworkTopology {
* @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) {
+ public void sortByDistance(Node reader, Node[] nodes,
+ int activeLen, long seed) {
/** Sort weights for the nodes array */
- int[] weights = new int[nodes.length];
- for (int i=0; i<nodes.length; i++) {
+ int[] weights = new int[activeLen];
+ for (int i=0; i<activeLen; 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++) {
+ for (int i=0; i<activeLen; i++) {
int weight = weights[i];
Node node = nodes[i];
List<Node> list = tree.get(weight);
@@ -917,7 +918,7 @@ public class NetworkTopology {
}
}
}
- Preconditions.checkState(idx == nodes.length,
+ Preconditions.checkState(idx == activeLen,
"Sorted the wrong number of nodes!");
}
}
Modified:
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java?rev=1601869&r1=1601868&r2=1601869&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java
(original)
+++
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetworkTopologyWithNodeGroup.java
Wed Jun 11 12:20:48 2014
@@ -279,7 +279,8 @@ public class NetworkTopologyWithNodeGrou
* set of nodes at each network distance.
*/
@Override
- public void sortByDistance( Node reader, Node[] nodes, long seed) {
+ public void sortByDistance( Node reader, Node[] nodes,
+ int activeLen, 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.
if (reader != null && !this.contains(reader)) {
@@ -292,7 +293,7 @@ public class NetworkTopologyWithNodeGrou
return;
}
}
- super.sortByDistance(reader, nodes, seed);
+ super.sortByDistance(reader, nodes, nodes.length, seed);
}
/** InnerNodeWithNodeGroup represents a switch/router of a data center, rack
Modified:
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java?rev=1601869&r1=1601868&r2=1601869&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java
(original)
+++
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java
Wed Jun 11 12:20:48 2014
@@ -605,7 +605,7 @@ public class TestNetUtils {
@Test
public void testNormalizeHostName() {
List<String> hosts = Arrays.asList(new String[] {"127.0.0.1",
- "localhost", "3w.org", "UnknownHost123"});
+ "localhost", "1.kanyezone.appspot.com", "UnknownHost123"});
List<String> normalizedHosts = NetUtils.normalizeHostNames(hosts);
// when ipaddress is normalized, same address is expected in return
assertEquals(normalizedHosts.get(0), hosts.get(0));
@@ -636,4 +636,4 @@ public class TestNetUtils {
String gotStr = StringUtils.join(got, ", ");
assertEquals(expectStr, gotStr);
}
-}
\ No newline at end of file
+}
Modified:
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetworkTopologyWithNodeGroup.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetworkTopologyWithNodeGroup.java?rev=1601869&r1=1601868&r2=1601869&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetworkTopologyWithNodeGroup.java
(original)
+++
hadoop/common/branches/HDFS-5442/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetworkTopologyWithNodeGroup.java
Wed Jun 11 12:20:48 2014
@@ -104,7 +104,8 @@ public class TestNetworkTopologyWithNode
testNodes[1] = dataNodes[2];
testNodes[2] = dataNodes[3];
testNodes[3] = dataNodes[0];
- cluster.sortByDistance(dataNodes[0], testNodes, 0xDEADBEEF);
+ cluster.sortByDistance(dataNodes[0], testNodes,
+ testNodes.length, 0xDEADBEEF);
assertTrue(testNodes[0] == dataNodes[0]);
assertTrue(testNodes[1] == dataNodes[1]);
assertTrue(testNodes[2] == dataNodes[2]);
@@ -115,7 +116,8 @@ public class TestNetworkTopologyWithNode
testNodes[1] = dataNodes[4];
testNodes[2] = dataNodes[1];
testNodes[3] = dataNodes[0];
- cluster.sortByDistance(dataNodes[0], testNodes, 0xDEADBEEF);
+ cluster.sortByDistance(dataNodes[0], testNodes,
+ testNodes.length, 0xDEADBEEF);
assertTrue(testNodes[0] == dataNodes[0]);
assertTrue(testNodes[1] == dataNodes[1]);
@@ -124,7 +126,8 @@ public class TestNetworkTopologyWithNode
testNodes[1] = dataNodes[3];
testNodes[2] = dataNodes[2];
testNodes[3] = dataNodes[0];
- cluster.sortByDistance(dataNodes[0], testNodes, 0xDEADBEEF);
+ cluster.sortByDistance(dataNodes[0], testNodes,
+ testNodes.length, 0xDEADBEEF);
assertTrue(testNodes[0] == dataNodes[0]);
assertTrue(testNodes[1] == dataNodes[2]);
@@ -133,7 +136,8 @@ public class TestNetworkTopologyWithNode
testNodes[1] = dataNodes[7];
testNodes[2] = dataNodes[2];
testNodes[3] = dataNodes[0];
- cluster.sortByDistance(computeNode, testNodes, 0xDEADBEEF);
+ cluster.sortByDistance(computeNode, testNodes,
+ testNodes.length, 0xDEADBEEF);
assertTrue(testNodes[0] == dataNodes[0]);
assertTrue(testNodes[1] == dataNodes[2]);
}
