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 95F89200D13 for ; Sat, 16 Sep 2017 01:21:00 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 94B931609D2; Fri, 15 Sep 2017 23:21:00 +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 D92E71609D1 for ; Sat, 16 Sep 2017 01:20:59 +0200 (CEST) Received: (qmail 11322 invoked by uid 500); 15 Sep 2017 23:20:57 -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 11313 invoked by uid 99); 15 Sep 2017 23:20:57 -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, 15 Sep 2017 23:20:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 72A9CF56AC; Fri, 15 Sep 2017 23:20:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wang@apache.org To: common-commits@hadoop.apache.org Message-Id: <8cb63e0af3074297a422e85046ce2974@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-10701. TestDFSStripedOutputStreamWithFailure#testBlockTokenExpired occasionally fails. Contributed by SammiChen. Date: Fri, 15 Sep 2017 23:20:57 +0000 (UTC) archived-at: Fri, 15 Sep 2017 23:21:00 -0000 Repository: hadoop Updated Branches: refs/heads/branch-3.0 21f6aa77a -> 7ea10e9f9 HDFS-10701. TestDFSStripedOutputStreamWithFailure#testBlockTokenExpired occasionally fails. Contributed by SammiChen. (cherry picked from commit ef8cd5dc565f901b4954befe784675e130e84c3c) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7ea10e9f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7ea10e9f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7ea10e9f Branch: refs/heads/branch-3.0 Commit: 7ea10e9f968230d4cf4948fcddbbe8b627539963 Parents: 21f6aa7 Author: Andrew Wang Authored: Fri Sep 15 16:20:36 2017 -0700 Committer: Andrew Wang Committed: Fri Sep 15 16:20:39 2017 -0700 ---------------------------------------------------------------------- .../hadoop/hdfs/TestDFSStripedOutputStreamWithFailure.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7ea10e9f/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSStripedOutputStreamWithFailure.java ---------------------------------------------------------------------- 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 ea889e3..57da439 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 class TestDFSStripedOutputStreamWithFailure { @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 @@ public class TestDFSStripedOutputStreamWithFailure { 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(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org