hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iwasak...@apache.org
Subject hadoop git commit: HDFS-2043. TestHFlush failing intermittently. Contributed by Lin Yiqun.
Date Fri, 06 May 2016 06:54:34 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 921562720 -> c80b47e73


HDFS-2043. TestHFlush failing intermittently. Contributed by Lin Yiqun.

(cherry picked from commit 2835f146b551f911ea13307e7762759813898757)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c80b47e7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c80b47e7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c80b47e7

Branch: refs/heads/branch-2.8
Commit: c80b47e73f2f5c270d724b8aaaf63b54ffc3b046
Parents: 9215627
Author: Masatake Iwasaki <iwasakims@apache.org>
Authored: Fri May 6 15:36:47 2016 +0900
Committer: Masatake Iwasaki <iwasakims@apache.org>
Committed: Fri May 6 15:50:48 2016 +0900

----------------------------------------------------------------------
 .../src/test/java/org/apache/hadoop/hdfs/TestHFlush.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c80b47e7/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHFlush.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHFlush.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHFlush.java
index 1846cc9..ce49f69 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHFlush.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestHFlush.java
@@ -485,8 +485,14 @@ public class TestHFlush {
         // If we got the exception, we shouldn't have interrupted status anymore.
         assertFalse(Thread.interrupted());
 
-        // Now do a successful close.
-        stm.close();
+        // Do the try-catch in the second stm.close() avoid that streamer was already
+        // closed in other places.
+        try {
+          // Now do a successful close.
+          stm.close();
+        } catch (IOException e) {
+          System.out.println("Got expected exception during second close");
+        }
       }
 
 


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message