Skip to content

HBASE-22615 Make TestChoreService more robust to timing #328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
busbey wants to merge 1 commit into from
Closed

HBASE-22615 Make TestChoreService more robust to timing #328

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 12 additions & 10 deletions hbase-common/src/test/java/org/apache/hadoop/hbase/TestChoreService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,17 +354,17 @@ public void testChoreServiceConstruction() throws InterruptedException {
public void testFrequencyOfChores() throws InterruptedException {
final int period = 100;
// Small delta that acts as time buffer (allowing chores to complete if running slowly)
final int delta = 5;
final int delta = period/5;
ChoreService service = new ChoreService("testFrequencyOfChores");
CountingChore chore = new CountingChore("countingChore", period);
try {
service.scheduleChore(chore);

Thread.sleep(10 * period + delta);
assertTrue(chore.getCountOfChoreCalls() == 11);
assertEquals("10 periods have elapsed.", 11, chore.getCountOfChoreCalls());

Thread.sleep(10 * period);
assertTrue(chore.getCountOfChoreCalls() == 21);
Thread.sleep(10 * period + delta);
assertEquals("20 periods have elapsed.", 21, chore.getCountOfChoreCalls());
} finally {
shutdownService(service);
}
Expand All @@ -380,14 +380,14 @@ public void shutdownService(ChoreService service) throws InterruptedException {
@Test
public void testForceTrigger() throws InterruptedException {
final int period = 100;
final int delta = 10;
final int delta = period/10;
ChoreService service = new ChoreService("testForceTrigger");
final CountingChore chore = new CountingChore("countingChore", period);
try {
service.scheduleChore(chore);
Thread.sleep(10 * period + delta);

assertTrue(chore.getCountOfChoreCalls() == 11);
assertEquals("10 periods have elapsed.", 11, chore.getCountOfChoreCalls());

// Force five runs of the chore to occur, sleeping between triggers to ensure the
// chore has time to run
Expand All @@ -402,12 +402,14 @@ public void testForceTrigger() throws InterruptedException {
chore.triggerNow();
Thread.sleep(delta);

assertTrue("" + chore.getCountOfChoreCalls(), chore.getCountOfChoreCalls() == 16);
assertEquals("Trigger was called 5 times after 10 periods.", 16,
chore.getCountOfChoreCalls());

Thread.sleep(10 * period + delta);

// Be loosey-goosey. It used to be '26' but it was a big flakey relying on timing.
assertTrue("" + chore.getCountOfChoreCalls(), chore.getCountOfChoreCalls() > 16);
assertTrue("Expected at least 16 invocations, instead got " + chore.getCountOfChoreCalls(),
chore.getCountOfChoreCalls() > 16);
} finally {
shutdownService(service);
}
Expand All @@ -419,7 +421,7 @@ public void testCorePoolIncrease() throws InterruptedException {
ChoreService service = new ChoreService("testCorePoolIncrease", initialCorePoolSize, false);

try {
assertEquals("Should have a core pool of size: " + initialCorePoolSize, initialCorePoolSize,
assertEquals("Setting core pool size gave unexpected results.", initialCorePoolSize,
service.getCorePoolSize());

final int slowChorePeriod = 100;
Expand Down Expand Up @@ -703,7 +705,7 @@ public void testStopperForScheduledChores() throws InterruptedException {
Stoppable stopperForGroup1 = new SampleStopper();
Stoppable stopperForGroup2 = new SampleStopper();
final int period = 100;
final int delta = 10;
final int delta = period/10;

try {
ScheduledChore chore1_group1 = new DoNothingChore("c1g1", stopperForGroup1, period);
Expand Down