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 02787200B2D for ; Thu, 16 Jun 2016 20:32:35 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0111A160A52; Thu, 16 Jun 2016 18:32:35 +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 4B956160A60 for ; Thu, 16 Jun 2016 20:32:34 +0200 (CEST) Received: (qmail 22798 invoked by uid 500); 16 Jun 2016 18:32:26 -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 21915 invoked by uid 99); 16 Jun 2016 18:32:26 -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; Thu, 16 Jun 2016 18:32:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5C8BEE07F6; Thu, 16 Jun 2016 18:32:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aengineer@apache.org To: common-commits@hadoop.apache.org Date: Thu, 16 Jun 2016 18:32:45 -0000 Message-Id: In-Reply-To: <92d5ec242da743e5b0220e461401c34f@git.apache.org> References: <92d5ec242da743e5b0220e461401c34f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [21/49] hadoop git commit: HADOOP-13243. TestRollingFileSystemSink.testSetInitialFlushTime() fails intermittently. (Daniel Templeton via kasha) archived-at: Thu, 16 Jun 2016 18:32:35 -0000 HADOOP-13243. TestRollingFileSystemSink.testSetInitialFlushTime() fails intermittently. (Daniel Templeton via kasha) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/49b40646 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/49b40646 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/49b40646 Branch: refs/heads/HDFS-7240 Commit: 49b4064644b242921af4ddf1de9932bc7bcf5f0e Parents: 7dae2b3 Author: Karthik Kambatla Authored: Sun Jun 12 14:12:31 2016 -0700 Committer: Karthik Kambatla Committed: Sun Jun 12 14:12:31 2016 -0700 ---------------------------------------------------------------------- .../hadoop/metrics2/sink/TestRollingFileSystemSink.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/49b40646/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestRollingFileSystemSink.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestRollingFileSystemSink.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestRollingFileSystemSink.java index 9c34dba..1273052 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestRollingFileSystemSink.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/metrics2/sink/TestRollingFileSystemSink.java @@ -118,15 +118,14 @@ public class TestRollingFileSystemSink { diff = rfsSink.nextFlush.getTimeInMillis() - calendar.getTimeInMillis(); assertTrue("The initial flush time was calculated incorrectly: " + diff, - (diff >= -1000L) && (diff < -900L)); + (diff == 0L) || ((diff > -1000L) && (diff < -900L))); calendar.set(Calendar.MILLISECOND, 10); rfsSink.setInitialFlushTime(calendar.getTime()); diff = rfsSink.nextFlush.getTimeInMillis() - calendar.getTimeInMillis(); assertTrue("The initial flush time was calculated incorrectly: " + diff, - ((diff >= -10L) && (diff <= 0L) || - ((diff > -1000L) && (diff < -910L)))); + (diff >= -10L) && (diff <= 0L) || ((diff > -1000L) && (diff < -910L))); calendar.set(Calendar.SECOND, 1); calendar.set(Calendar.MILLISECOND, 10); @@ -134,8 +133,7 @@ public class TestRollingFileSystemSink { diff = rfsSink.nextFlush.getTimeInMillis() - calendar.getTimeInMillis(); assertTrue("The initial flush time was calculated incorrectly: " + diff, - ((diff >= -10L) && (diff <= 0L) || - ((diff > -1000L) && (diff < -910L)))); + (diff >= -10L) && (diff <= 0L) || ((diff > -1000L) && (diff < -910L))); // Now try pathological settings rfsSink = new RollingFileSystemSink(1000, 1000000); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org