Repository: hadoop Updated Branches: refs/heads/branch-2 846de7d84 -> 040c582b9
HDFS-9435. TestBlockRecovery#testRBWReplicas is failing intermittently. Contributed by Rakesh R. (cherry picked from commit 001ecf962cc93f4b880922b6eb03a5ca5d21f661) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/040c582b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/040c582b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/040c582b Branch: refs/heads/branch-2 Commit: 040c582b99d67935235ac23bb0255efc510c5e48 Parents: 846de7d Author: Walter Su <waltersu4...@apache.org> Authored: Mon Nov 23 15:49:58 2015 +0800 Committer: Walter Su <waltersu4...@apache.org> Committed: Mon Nov 23 15:50:57 2015 +0800 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hdfs/server/datanode/TestBlockRecovery.java | 28 ++++++++++++++++++++ 2 files changed, 31 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/040c582b/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 6c0866e..3b4f3b0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1501,6 +1501,9 @@ Release 2.8.0 - UNRELEASED HDFS-9428. Fix intermittent failure of TestDNFencing.testQueueingWithAppend. (Masatake Iwasaki via waltersu4549) + HDFS-9435. TestBlockRecovery#testRBWReplicas is failing intermittently. + (Rakesh R via waltersu4549) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/040c582b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery.java index 6176484..b4f3058 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestBlockRecovery.java @@ -41,6 +41,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.commons.logging.Log; @@ -90,6 +91,8 @@ import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import com.google.common.base.Supplier; + /** * This tests if sync all replicas in block recovery works correctly */ @@ -179,11 +182,36 @@ public class TestBlockRecovery { }; // Trigger a heartbeat so that it acknowledges the NN as active. dn.getAllBpOs().get(0).triggerHeartbeatForTests(); + waitForActiveNN(); + spyDN = spy(dn); recoveryWorker = new BlockRecoveryWorker(spyDN); } /** + * Wait for active NN up to 15 seconds. + */ + private void waitForActiveNN() { + try { + GenericTestUtils.waitFor(new Supplier<Boolean>() { + @Override + public Boolean get() { + return dn.getAllBpOs().get(0).getActiveNN() != null; + } + }, 1000, 15 * 1000); + } catch (TimeoutException e) { + // Here its not failing, will again do the assertions for activeNN after + // this waiting period and fails there if BPOS has not acknowledged + // any NN as active. + LOG.warn("Failed to get active NN", e); + } catch (InterruptedException e) { + LOG.warn("InterruptedException while waiting to see active NN", e); + } + Assert.assertNotNull("Failed to get ActiveNN", + dn.getAllBpOs().get(0).getActiveNN()); + } + + /** * Cleans the resources and closes the instance of datanode * @throws IOException if an error occurred */
