hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From waltersu4...@apache.org
Subject hadoop git commit: HDFS-9428. Fix intermittent failure of TestDNFencing.testQueueingWithAppend. Contributed by Masatake Iwasaki.
Date Mon, 23 Nov 2015 07:40:32 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 f826195ee -> 846de7d84


HDFS-9428. Fix intermittent failure of TestDNFencing.testQueueingWithAppend. Contributed by
Masatake Iwasaki.

(cherry picked from commit 5aba093361dcf6bb642e533700f772b9a94154ad)


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

Branch: refs/heads/branch-2
Commit: 846de7d8429c9e071287384802c0af81f868e1ed
Parents: f826195
Author: Walter Su <waltersu4549@apache.org>
Authored: Mon Nov 23 15:35:06 2015 +0800
Committer: Walter Su <waltersu4549@apache.org>
Committed: Mon Nov 23 15:38:41 2015 +0800

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt                       | 3 +++
 .../org/apache/hadoop/hdfs/server/namenode/ha/TestDNFencing.java  | 1 +
 2 files changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/846de7d8/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 470f02d..6c0866e 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1498,6 +1498,9 @@ Release 2.8.0 - UNRELEASED
 
     HDFS-9024. Deprecate the TotalFiles metric. (Akira Ajisaka via wheat9)
 
+    HDFS-9428. Fix intermittent failure of
+    TestDNFencing.testQueueingWithAppend. (Masatake Iwasaki via waltersu4549)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/846de7d8/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDNFencing.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDNFencing.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDNFencing.java
index 9df4399..74bc73d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDNFencing.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestDNFencing.java
@@ -456,6 +456,7 @@ public class TestDNFencing {
       numQueued += numDN * 2; // RBW messages, see comments in case 1
     } finally {
       IOUtils.closeStream(out);
+      cluster.triggerHeartbeats();
       numQueued += numDN; // blockReceived
     }
     assertEquals(numQueued, cluster.getNameNode(1).getNamesystem().


Mime
View raw message