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 <ka...@cloudera.com> Authored: Sun Jun 12 14:12:31 2016 -0700 Committer: Karthik Kambatla <ka...@cloudera.com> 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-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org