Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 188A718012 for ; Mon, 23 Nov 2015 07:40:11 +0000 (UTC) Received: (qmail 22950 invoked by uid 500); 23 Nov 2015 07:40:10 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 22878 invoked by uid 500); 23 Nov 2015 07:40:10 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 22869 invoked by uid 99); 23 Nov 2015 07:40:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Nov 2015 07:40:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8DF87E01F4; Mon, 23 Nov 2015 07:40:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: waltersu4549@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-9428. Fix intermittent failure of TestDNFencing.testQueueingWithAppend. Contributed by Masatake Iwasaki. Date: Mon, 23 Nov 2015 07:40:10 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/trunk 817ae221a -> 5aba09336 HDFS-9428. Fix intermittent failure of TestDNFencing.testQueueingWithAppend. Contributed by Masatake Iwasaki. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5aba0933 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5aba0933 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5aba0933 Branch: refs/heads/trunk Commit: 5aba093361dcf6bb642e533700f772b9a94154ad Parents: 817ae22 Author: Walter Su Authored: Mon Nov 23 15:35:06 2015 +0800 Committer: Walter Su Committed: Mon Nov 23 15:37:45 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/5aba0933/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 2b56361..c1e45e9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -2353,6 +2353,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/5aba0933/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().