Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-4669. Merge change 1466176 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1466181 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Suresh Srinivas 2013-04-09 19:09:01 +00:00
parent 4167aed789
commit 4f82642185
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -141,6 +141,9 @@ Release 2.0.5-beta - UNRELEASED
HDFS-4676. TestHDFSFileSystemContract should set MiniDFSCluster variable HDFS-4676. TestHDFSFileSystemContract should set MiniDFSCluster variable
to null to free up memory. (suresh) to null to free up memory. (suresh)
HDFS-4669. TestBlockPoolManager fails using IBM java. (Tian Hong Wang via
suresh)
Release 2.0.4-alpha - UNRELEASED Release 2.0.4-alpha - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSUtil.java
View File

@ -458,7 +458,7 @@ public class DFSUtil {
// Look for configurations of the form <key>[.<nameserviceId>][.<namenodeId>] // Look for configurations of the form <key>[.<nameserviceId>][.<namenodeId>]
// across all of the configured nameservices and namenodes. // across all of the configured nameservices and namenodes.
Map<String, Map<String, InetSocketAddress>> ret = Maps.newHashMap(); Map<String, Map<String, InetSocketAddress>> ret = Maps.newLinkedHashMap();
for (String nsId : emptyAsSingletonNull(nameserviceIds)) { for (String nsId : emptyAsSingletonNull(nameserviceIds)) {
Map<String, InetSocketAddress> isas = Map<String, InetSocketAddress> isas =
getAddressesForNameserviceId(conf, nsId, defaultAddress, keys); getAddressesForNameserviceId(conf, nsId, defaultAddress, keys);

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BlockPoolManager.java
View File

@ -160,8 +160,8 @@ class BlockPoolManager {
Map<String, Map<String, InetSocketAddress>> addrMap) throws IOException { Map<String, Map<String, InetSocketAddress>> addrMap) throws IOException {
assert Thread.holdsLock(refreshNamenodesLock); assert Thread.holdsLock(refreshNamenodesLock);
Set<String> toRefresh = Sets.newHashSet(); Set<String> toRefresh = Sets.newLinkedHashSet();
Set<String> toAdd = Sets.newHashSet(); Set<String> toAdd = Sets.newLinkedHashSet();
Set<String> toRemove; Set<String> toRemove;
synchronized (this) { synchronized (this) {

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockPoolManager.java
View File

@ -113,7 +113,7 @@ public class TestBlockPoolManager {
// Remove the first NS // Remove the first NS
conf.set(DFSConfigKeys.DFS_NAMESERVICES, conf.set(DFSConfigKeys.DFS_NAMESERVICES,
"ns1"); "ns2");
bpm.refreshNamenodes(conf); bpm.refreshNamenodes(conf);
assertEquals( assertEquals(
"stop #1\n" + "stop #1\n" +