HBASE-8289 TestThreads#testSleepWithoutInterrupt should not expect a bounded wait time

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1465910 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
nkeywal 2013-04-09 07:07:50 +00:00
parent 53a7045cd9
commit c583d4be32
1 changed files with 17 additions and 15 deletions

View File

@ -26,16 +26,18 @@ import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
import java.util.concurrent.atomic.AtomicBoolean;
@Category(SmallTests.class) @Category(SmallTests.class)
public class TestThreads { public class TestThreads {
private static final Log LOG = LogFactory.getLog(TestThreads.class); private static final Log LOG = LogFactory.getLog(TestThreads.class);
private static final int SLEEP_TIME_MS = 5000; private static final int SLEEP_TIME_MS = 3000;
private static final int TOLERANCE_MS = (int) (0.05 * SLEEP_TIME_MS); private static final int TOLERANCE_MS = (int) (0.10 * SLEEP_TIME_MS);
private volatile boolean wasInterrupted; private final AtomicBoolean wasInterrupted = new AtomicBoolean(false);
@Test(timeout=6000) @Test(timeout=60000)
public void testSleepWithoutInterrupt() throws InterruptedException { public void testSleepWithoutInterrupt() throws InterruptedException {
Thread sleeper = new Thread(new Runnable() { Thread sleeper = new Thread(new Runnable() {
@Override @Override
@ -43,34 +45,34 @@ public class TestThreads {
LOG.debug("Sleeper thread: sleeping for " + SLEEP_TIME_MS); LOG.debug("Sleeper thread: sleeping for " + SLEEP_TIME_MS);
Threads.sleepWithoutInterrupt(SLEEP_TIME_MS); Threads.sleepWithoutInterrupt(SLEEP_TIME_MS);
LOG.debug("Sleeper thread: finished sleeping"); LOG.debug("Sleeper thread: finished sleeping");
wasInterrupted = Thread.currentThread().isInterrupted(); wasInterrupted.set(Thread.currentThread().isInterrupted());
} }
}); });
LOG.debug("Starting sleeper thread (" + SLEEP_TIME_MS + " ms)"); LOG.debug("Starting sleeper thread (" + SLEEP_TIME_MS + " ms)");
sleeper.start(); sleeper.start();
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
LOG.debug("Main thread: sleeping for 500 ms"); LOG.debug("Main thread: sleeping for 200 ms");
Threads.sleep(200);
LOG.debug("Interrupting the sleeper thread and sleeping for 500 ms");
sleeper.interrupt();
Threads.sleep(500); Threads.sleep(500);
LOG.debug("Interrupting the sleeper thread and sleeping for 2000 ms"); LOG.debug("Interrupting the sleeper thread and sleeping for 800 ms");
sleeper.interrupt(); sleeper.interrupt();
Threads.sleep(2000); Threads.sleep(800);
LOG.debug("Interrupting the sleeper thread and sleeping for 1000 ms");
sleeper.interrupt();
Threads.sleep(1000);
LOG.debug("Interrupting the sleeper thread again"); LOG.debug("Interrupting the sleeper thread again");
sleeper.interrupt(); sleeper.interrupt();
sleeper.join(); sleeper.join();
assertTrue("sleepWithoutInterrupt did not preserve the thread's " + assertTrue("sleepWithoutInterrupt did not preserve the thread's " +
"interrupted status", wasInterrupted); "interrupted status", wasInterrupted.get());
long timeElapsed = System.currentTimeMillis() - startTime; long timeElapsed = System.currentTimeMillis() - startTime;
// We expect to wait at least SLEEP_TIME_MS, but we can wait more if there is a GC.
assertTrue("Elapsed time " + timeElapsed + " ms is out of the expected " + assertTrue("Elapsed time " + timeElapsed + " ms is out of the expected " +
"range of the sleep time " + SLEEP_TIME_MS, " sleep time of " + SLEEP_TIME_MS, SLEEP_TIME_MS - timeElapsed < TOLERANCE_MS);
Math.abs(timeElapsed - SLEEP_TIME_MS) < TOLERANCE_MS);
LOG.debug("Target sleep time: " + SLEEP_TIME_MS + ", time elapsed: " + LOG.debug("Target sleep time: " + SLEEP_TIME_MS + ", time elapsed: " +
timeElapsed); timeElapsed);
} }