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

HDFS-9514. TestDistributedFileSystem.testDFSClientPeerWriteTimeout failing; exception being swallowed. (Wei-Chiu Chuang via Yongjun Zhang)

This commit is contained in:
Yongjun Zhang 2015-12-11 19:52:38 -08:00
parent 2a4c7d4fac
commit bf5295b118
2 changed files with 20 additions and 10 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

@ -1745,6 +1745,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9519. Some coding improvement in SecondaryNameNode#main. HDFS-9519. Some coding improvement in SecondaryNameNode#main.
(Xiao Chen via Yongjun Zhang) (Xiao Chen via Yongjun Zhang)
HDFS-9514. TestDistributedFileSystem.testDFSClientPeerWriteTimeout failing;
exception being swallowed. (Wei-Chiu Chuang via Yongjun Zhang)
OPTIMIZATIONS OPTIMIZATIONS
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than

27
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
View File

@ -990,10 +990,14 @@ public class TestDistributedFileSystem {
Assert.fail("read should timeout"); Assert.fail("read should timeout");
} catch (SocketTimeoutException ste) { } catch (SocketTimeoutException ste) {
long delta = Time.now() - start; long delta = Time.now() - start;
Assert.assertTrue("read timedout too soon", delta >= timeout*0.9); if (delta < timeout*0.9) {
Assert.assertTrue("read timedout too late", delta <= timeout*1.1); throw new IOException("read timedout too soon in " + delta + " ms.",
} catch (Throwable t) { ste);
Assert.fail("wrong exception:"+t); }
if (delta > timeout*1.1) {
throw new IOException("read timedout too late in " + delta + " ms.",
ste);
}
} }
} finally { } finally {
cluster.shutdown(); cluster.shutdown();
@ -1037,12 +1041,15 @@ public class TestDistributedFileSystem {
Assert.fail("write finish in " + delta + " ms" + "but should timedout"); Assert.fail("write finish in " + delta + " ms" + "but should timedout");
} catch (SocketTimeoutException ste) { } catch (SocketTimeoutException ste) {
long delta = Time.now() - start; long delta = Time.now() - start;
Assert.assertTrue("write timedout too soon in " + delta + " ms",
delta >= timeout * 0.9); if (delta < timeout * 0.9) {
Assert.assertTrue("write timedout too late in " + delta + " ms", throw new IOException("write timedout too soon in " + delta + " ms.",
delta <= timeout * 1.2); ste);
} catch (Throwable t) { }
Assert.fail("wrong exception:" + t); if (delta > timeout * 1.2) {
throw new IOException("write timedout too late in " + delta + " ms.",
ste);
}
} }
} finally { } finally {
cluster.shutdown(); cluster.shutdown();