Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3694C200C82 for ; Sat, 13 May 2017 00:48:17 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3523E160BC8; Fri, 12 May 2017 22:48:17 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7C448160BB8 for ; Sat, 13 May 2017 00:48:16 +0200 (CEST) Received: (qmail 85283 invoked by uid 500); 12 May 2017 22:48:15 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 85274 invoked by uid 99); 12 May 2017 22:48:15 -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; Fri, 12 May 2017 22:48:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 79365DFDD5; Fri, 12 May 2017 22:48:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jlowe@apache.org To: common-commits@hadoop.apache.org Message-Id: <92be95b5706a4095bccc6ed7aed5aabb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-11818. TestBlockManager.testSufficientlyReplBlocksUsesNewRack fails intermittently. Contributed by Nathan Roberts Date: Fri, 12 May 2017 22:48:15 +0000 (UTC) archived-at: Fri, 12 May 2017 22:48:17 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2.8 dfa2657ab -> f42222a75 HDFS-11818. TestBlockManager.testSufficientlyReplBlocksUsesNewRack fails intermittently. Contributed by Nathan Roberts (cherry picked from commit aeca471ec13135064f9605174cd6daa120007b18) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f42222a7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f42222a7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f42222a7 Branch: refs/heads/branch-2.8 Commit: f42222a75ba41613644e077cedef453cf07f02cf Parents: dfa2657 Author: Jason Lowe Authored: Fri May 12 17:47:17 2017 -0500 Committer: Jason Lowe Committed: Fri May 12 17:48:00 2017 -0500 ---------------------------------------------------------------------- .../hadoop/hdfs/server/blockmanagement/TestBlockManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f42222a7/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java index b846658..111bfa8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockManager.java @@ -153,7 +153,6 @@ public class TestBlockManager { Mockito.when(haContext.getState()).thenReturn(haState); Mockito.when(haState.shouldPopulateReplQueues()).thenReturn(true); Mockito.when(fsn.getHAContext()).thenReturn(haContext); - bm.setInitializedReplQueues(true); CacheManager cm = Mockito.mock(CacheManager.class); Mockito.doReturn(cm).when(fsn).getCacheManager(); GSet cb = @@ -897,10 +896,12 @@ public class TestBlockManager { StorageReceivedDeletedBlocks srdb = new StorageReceivedDeletedBlocks(new DatanodeStorage(ds.getStorageID()), rdbiList.toArray(new ReceivedDeletedBlockInfo[rdbiList.size()])); + bm.setInitializedReplQueues(true); bm.processIncrementalBlockReport(node, srdb); // Needed replications should still be 0. assertEquals("UC block was incorrectly added to needed Replications", 0, bm.neededReplications.size()); + bm.setInitializedReplQueues(false); } private BlockInfo addBlockToBM(long blkId) { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org