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

HDFS-3936. MiniDFSCluster shutdown races with BlocksMap usage. Contributed by Eli Collins 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1387264 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2012-09-18 17:08:56 +00:00
parent b568b09f4e
commit d1e2d368a4
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,6 +27,8 @@ Release 2.0.3-alpha - Unreleased
HDFS-3924. Multi-byte id in HdfsVolumeId. (Andrew Wang via atm) HDFS-3924. Multi-byte id in HdfsVolumeId. (Andrew Wang via atm)
HDFS-3936. MiniDFSCluster shutdown races with BlocksMap usage. (eli)
Release 2.0.2-alpha - 2012-09-07 Release 2.0.2-alpha - 2012-09-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlocksMap.java
View File

@ -94,7 +94,7 @@ class BlocksMap {
} }
void close() { void close() {
blocks = null; // Empty blocks once GSet#clear is implemented (HDFS-3940)
} }
BlockCollection getBlockCollection(Block b) { BlockCollection getBlockCollection(Block b) {

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSClientRetries.java
View File

@ -778,7 +778,7 @@ public class TestDFSClientRetries {
} }
/** Test client retry with namenode restarting. */ /** Test client retry with namenode restarting. */
@Test @Test(timeout=300000)
public void testNamenodeRestart() throws Exception { public void testNamenodeRestart() throws Exception {
namenodeRestartTest(new Configuration(), false); namenodeRestartTest(new Configuration(), false);
} }

4
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHDFS.java
View File

@ -80,7 +80,7 @@ public class TestWebHDFS {
} }
} }
@Test @Test(timeout=300000)
public void testLargeFile() throws Exception { public void testLargeFile() throws Exception {
largeFileTest(200L << 20); //200MB file length largeFileTest(200L << 20); //200MB file length
} }
@ -202,7 +202,7 @@ public class TestWebHDFS {
} }
/** Test client retry with namenode restarting. */ /** Test client retry with namenode restarting. */
@Test @Test(timeout=300000)
public void testNamenodeRestart() throws Exception { public void testNamenodeRestart() throws Exception {
((Log4JLogger)NamenodeWebHdfsMethods.LOG).getLogger().setLevel(Level.ALL); ((Log4JLogger)NamenodeWebHdfsMethods.LOG).getLogger().setLevel(Level.ALL);
final Configuration conf = WebHdfsTestUtil.createConf(); final Configuration conf = WebHdfsTestUtil.createConf();