MAPREDUCE-5454. TestDFSIO fails intermittently on JDK7 (Karthik Kambatla via Sandy Ryza)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1513368 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sanford Ryza 2013-08-13 07:03:43 +00:00
parent 1d1ab587e4
commit a6ff2270c5
2 changed files with 12 additions and 7 deletions

View File

@ -220,6 +220,9 @@ Release 2.1.1-beta - UNRELEASED
MAPREDUCE-5425. Junit in TestJobHistoryServer failing in jdk 7 (Robert MAPREDUCE-5425. Junit in TestJobHistoryServer failing in jdk 7 (Robert
Parker via jlowe) Parker via jlowe)
MAPREDUCE-5454. TestDFSIO fails intermittently on JDK7 (Karthik Kambatla
via Sandy Ryza)
Release 2.1.0-beta - 2013-08-06 Release 2.1.0-beta - 2013-08-06
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -208,6 +208,9 @@ public static void beforeClass() throws Exception {
.build(); .build();
FileSystem fs = cluster.getFileSystem(); FileSystem fs = cluster.getFileSystem();
bench.createControlFile(fs, DEFAULT_NR_BYTES, DEFAULT_NR_FILES); bench.createControlFile(fs, DEFAULT_NR_BYTES, DEFAULT_NR_FILES);
/** Check write here, as it is required for other tests */
testWrite();
} }
@AfterClass @AfterClass
@ -219,8 +222,7 @@ public static void afterClass() throws Exception {
cluster.shutdown(); cluster.shutdown();
} }
@Test public static void testWrite() throws Exception {
public void testWrite() throws Exception {
FileSystem fs = cluster.getFileSystem(); FileSystem fs = cluster.getFileSystem();
long tStart = System.currentTimeMillis(); long tStart = System.currentTimeMillis();
bench.writeTest(fs); bench.writeTest(fs);
@ -228,7 +230,7 @@ public void testWrite() throws Exception {
bench.analyzeResult(fs, TestType.TEST_TYPE_WRITE, execTime); bench.analyzeResult(fs, TestType.TEST_TYPE_WRITE, execTime);
} }
@Test @Test (timeout = 3000)
public void testRead() throws Exception { public void testRead() throws Exception {
FileSystem fs = cluster.getFileSystem(); FileSystem fs = cluster.getFileSystem();
long tStart = System.currentTimeMillis(); long tStart = System.currentTimeMillis();
@ -237,7 +239,7 @@ public void testRead() throws Exception {
bench.analyzeResult(fs, TestType.TEST_TYPE_READ, execTime); bench.analyzeResult(fs, TestType.TEST_TYPE_READ, execTime);
} }
@Test @Test (timeout = 3000)
public void testReadRandom() throws Exception { public void testReadRandom() throws Exception {
FileSystem fs = cluster.getFileSystem(); FileSystem fs = cluster.getFileSystem();
long tStart = System.currentTimeMillis(); long tStart = System.currentTimeMillis();
@ -247,7 +249,7 @@ public void testReadRandom() throws Exception {
bench.analyzeResult(fs, TestType.TEST_TYPE_READ_RANDOM, execTime); bench.analyzeResult(fs, TestType.TEST_TYPE_READ_RANDOM, execTime);
} }
@Test @Test (timeout = 3000)
public void testReadBackward() throws Exception { public void testReadBackward() throws Exception {
FileSystem fs = cluster.getFileSystem(); FileSystem fs = cluster.getFileSystem();
long tStart = System.currentTimeMillis(); long tStart = System.currentTimeMillis();
@ -257,7 +259,7 @@ public void testReadBackward() throws Exception {
bench.analyzeResult(fs, TestType.TEST_TYPE_READ_BACKWARD, execTime); bench.analyzeResult(fs, TestType.TEST_TYPE_READ_BACKWARD, execTime);
} }
@Test @Test (timeout = 3000)
public void testReadSkip() throws Exception { public void testReadSkip() throws Exception {
FileSystem fs = cluster.getFileSystem(); FileSystem fs = cluster.getFileSystem();
long tStart = System.currentTimeMillis(); long tStart = System.currentTimeMillis();
@ -267,7 +269,7 @@ public void testReadSkip() throws Exception {
bench.analyzeResult(fs, TestType.TEST_TYPE_READ_SKIP, execTime); bench.analyzeResult(fs, TestType.TEST_TYPE_READ_SKIP, execTime);
} }
@Test @Test (timeout = 3000)
public void testAppend() throws Exception { public void testAppend() throws Exception {
FileSystem fs = cluster.getFileSystem(); FileSystem fs = cluster.getFileSystem();
long tStart = System.currentTimeMillis(); long tStart = System.currentTimeMillis();