Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D739CCEB6 for ; Thu, 12 Jul 2012 19:02:19 +0000 (UTC) Received: (qmail 59669 invoked by uid 500); 12 Jul 2012 19:02:19 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 59602 invoked by uid 500); 12 Jul 2012 19:02:19 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 59593 invoked by uid 99); 12 Jul 2012 19:02:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jul 2012 19:02:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jul 2012 19:02:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6CF2C238897D; Thu, 12 Jul 2012 19:01:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1360858 [2/2] - in /hadoop/common/trunk/hadoop-common-project/hadoop-common/src: main/java/org/apache/hadoop/fs/ main/java/org/apache/hadoop/fs/viewfs/ main/java/org/apache/hadoop/io/ main/java/org/apache/hadoop/ipc/ main/java/org/apache/h... Date: Thu, 12 Jul 2012 19:01:54 -0000 To: common-commits@hadoop.apache.org From: eli@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120712190156.6CF2C238897D@eris.apache.org> Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MultithreadedTestUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MultithreadedTestUtil.java?rev=1360858&r1=1360857&r2=1360858&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MultithreadedTestUtil.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/MultithreadedTestUtil.java Thu Jul 12 19:01:49 2012 @@ -22,6 +22,7 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.util.Time; /** * A utility to easily test threaded/synchronized code. @@ -109,10 +110,10 @@ public abstract class MultithreadedTestU * have thrown up an error. */ public synchronized void waitFor(long millis) throws Exception { - long endTime = System.currentTimeMillis() + millis; + long endTime = Time.now() + millis; while (shouldRun() && finishedThreads.size() < testThreads.size()) { - long left = endTime - System.currentTimeMillis(); + long left = endTime - Time.now(); if (left <= 0) break; checkException(); wait(left); Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/TestMultithreadedTestUtil.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/TestMultithreadedTestUtil.java?rev=1360858&r1=1360857&r2=1360858&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/TestMultithreadedTestUtil.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/TestMultithreadedTestUtil.java Thu Jul 12 19:01:49 2012 @@ -26,6 +26,7 @@ import org.junit.Test; import org.apache.hadoop.test.MultithreadedTestUtil.TestContext; import org.apache.hadoop.test.MultithreadedTestUtil.TestingThread; import org.apache.hadoop.test.MultithreadedTestUtil.RepeatingTestThread; +import org.apache.hadoop.util.Time; public class TestMultithreadedTestUtil { @@ -47,9 +48,9 @@ public class TestMultithreadedTestUtil { } assertEquals(0, threadsRun.get()); ctx.startThreads(); - long st = System.currentTimeMillis(); + long st = Time.now(); ctx.waitFor(30000); - long et = System.currentTimeMillis(); + long et = Time.now(); // All threads should have run assertEquals(3, threadsRun.get()); @@ -69,7 +70,7 @@ public class TestMultithreadedTestUtil { } }); ctx.startThreads(); - long st = System.currentTimeMillis(); + long st = Time.now(); try { ctx.waitFor(30000); fail("waitFor did not throw"); @@ -77,7 +78,7 @@ public class TestMultithreadedTestUtil { // expected assertEquals(FAIL_MSG, rte.getCause().getMessage()); } - long et = System.currentTimeMillis(); + long et = Time.now(); // Test shouldn't have waited the full 30 seconds, since // the thread throws faster than that assertTrue("Test took " + (et - st) + "ms", @@ -94,7 +95,7 @@ public class TestMultithreadedTestUtil { } }); ctx.startThreads(); - long st = System.currentTimeMillis(); + long st = Time.now(); try { ctx.waitFor(30000); fail("waitFor did not throw"); @@ -102,7 +103,7 @@ public class TestMultithreadedTestUtil { // expected assertEquals("my ioe", rte.getCause().getMessage()); } - long et = System.currentTimeMillis(); + long et = Time.now(); // Test shouldn't have waited the full 30 seconds, since // the thread throws faster than that assertTrue("Test took " + (et - st) + "ms", @@ -121,10 +122,10 @@ public class TestMultithreadedTestUtil { } }); ctx.startThreads(); - long st = System.currentTimeMillis(); + long st = Time.now(); ctx.waitFor(3000); ctx.stop(); - long et = System.currentTimeMillis(); + long et = Time.now(); long elapsed = et - st; // Test should have waited just about 3 seconds Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java?rev=1360858&r1=1360857&r2=1360858&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestShell.java Thu Jul 12 19:01:49 2012 @@ -55,7 +55,7 @@ public class TestShell extends TestCase testInterval(Long.MIN_VALUE / 60000); // test a negative interval testInterval(0L); // test a zero interval testInterval(10L); // interval equal to 10mins - testInterval(System.currentTimeMillis() / 60000 + 60); // test a very big interval + testInterval(Time.now() / 60000 + 60); // test a very big interval } /**