You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by as...@apache.org on 2015/12/13 08:27:55 UTC
[36/37] hadoop git commit: HDFS-9514.
TestDistributedFileSystem.testDFSClientPeerWriteTimeout failing;
exception being swallowed. (Wei-Chiu Chuang via Yongjun Zhang)
HDFS-9514. TestDistributedFileSystem.testDFSClientPeerWriteTimeout failing; exception being swallowed. (Wei-Chiu Chuang via Yongjun Zhang)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bf5295b1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bf5295b1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bf5295b1
Branch: refs/heads/yarn-2877
Commit: bf5295b118a24e762f21bb2b9054e5e0c1d1d14a
Parents: 2a4c7d4
Author: Yongjun Zhang <yz...@cloudera.com>
Authored: Fri Dec 11 19:52:38 2015 -0800
Committer: Yongjun Zhang <yz...@cloudera.com>
Committed: Fri Dec 11 19:52:38 2015 -0800
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hadoop/hdfs/TestDistributedFileSystem.java | 27 ++++++++++++--------
2 files changed, 20 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf5295b1/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 767bbcb..4c1287c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1745,6 +1745,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9519. Some coding improvement in SecondaryNameNode#main.
(Xiao Chen via Yongjun Zhang)
+ HDFS-9514. TestDistributedFileSystem.testDFSClientPeerWriteTimeout failing;
+ exception being swallowed. (Wei-Chiu Chuang via Yongjun Zhang)
+
OPTIMIZATIONS
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf5295b1/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
index 0543e9d..e628752 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDistributedFileSystem.java
@@ -990,10 +990,14 @@ public class TestDistributedFileSystem {
Assert.fail("read should timeout");
} catch (SocketTimeoutException ste) {
long delta = Time.now() - start;
- Assert.assertTrue("read timedout too soon", delta >= timeout*0.9);
- Assert.assertTrue("read timedout too late", delta <= timeout*1.1);
- } catch (Throwable t) {
- Assert.fail("wrong exception:"+t);
+ if (delta < timeout*0.9) {
+ throw new IOException("read timedout too soon in " + delta + " ms.",
+ ste);
+ }
+ if (delta > timeout*1.1) {
+ throw new IOException("read timedout too late in " + delta + " ms.",
+ ste);
+ }
}
} finally {
cluster.shutdown();
@@ -1037,12 +1041,15 @@ public class TestDistributedFileSystem {
Assert.fail("write finish in " + delta + " ms" + "but should timedout");
} catch (SocketTimeoutException ste) {
long delta = Time.now() - start;
- Assert.assertTrue("write timedout too soon in " + delta + " ms",
- delta >= timeout * 0.9);
- Assert.assertTrue("write timedout too late in " + delta + " ms",
- delta <= timeout * 1.2);
- } catch (Throwable t) {
- Assert.fail("wrong exception:" + t);
+
+ if (delta < timeout * 0.9) {
+ throw new IOException("write timedout too soon in " + delta + " ms.",
+ ste);
+ }
+ if (delta > timeout * 1.2) {
+ throw new IOException("write timedout too late in " + delta + " ms.",
+ ste);
+ }
}
} finally {
cluster.shutdown();