From ef8cd5dc565f901b4954befe784675e130e84c3c Mon Sep 17 00:00:00 2001 From: Andrew Wang Date: Fri, 15 Sep 2017 16:20:36 -0700 Subject: [PATCH] HDFS-10701. TestDFSStripedOutputStreamWithFailure#testBlockTokenExpired occasionally fails. Contributed by SammiChen. --- .../hadoop/hdfs/TestDFSStripedOutputStreamWithFailure.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStreamWithFailure.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStreamWithFailure.java index ea889e38a9..57da439949 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStreamWithFailure.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStreamWithFailure.java @@ -260,8 +260,6 @@ public void testMultipleDatanodeFailureRandomLength() throws Exception { @Test(timeout=240000) public void testBlockTokenExpired() throws Exception { - // TODO: this is very flaky, re-enable it later. See HDFS-12417. - assumeTrue("Test has been temporarily disabled. See HDFS-12417.", false); final int length = dataBlocks * (blockSize - cellSize); final HdfsConfiguration conf = newHdfsConfiguration(); @@ -494,8 +492,8 @@ private void runTest(final int length, final int[] killPos, final BlockManager bm = nn.getNamesystem().getBlockManager(); final BlockTokenSecretManager sm = bm.getBlockTokenSecretManager(); - // set a short token lifetime (1 second) - SecurityTestUtil.setBlockTokenLifetime(sm, 1000L); + // set a short token lifetime (6 second) + SecurityTestUtil.setBlockTokenLifetime(sm, 6000L); } final AtomicInteger pos = new AtomicInteger();