Skip to content
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

Disable maximum elapsed time tests #18528

Merged
merged 1 commit into from
Nov 28, 2023
Merged

Disable maximum elapsed time tests #18528

Show file tree
Hide file tree
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
14 changes: 10 additions & 4 deletions test/functional/TestUtilities/src/org/openj9/test/util/TimeUtilities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public static boolean checkElapseTime(String testName, long startMillisTime, lon
result = false;
System.out.println("FAILED: " + testName + " elapsedMillisTime (" + elapsedMillisTime
+ "ms) should NOT be less than minElapsedMillisTime (" + minElapsedMillisTime + "ms)");
} else if (elapsedMillisTime > maxElapsedMillisTime) {
} else if ((maxElapsedMillisTime > 0) && (elapsedMillisTime > maxElapsedMillisTime)) {
result = false;
System.out.println("FAILED: " + testName + " elapsedMillisTime (" + elapsedMillisTime
+ "ms) should NOT be greater than maxElapsedMillisTime (" + maxElapsedMillisTime + "ms)");
Expand All @@ -73,7 +73,7 @@ public static boolean checkElapseTime(String testName, long startMillisTime, lon
result = false;
System.out.println("FAILED: " + testName + " elapsedNanoTimeInMillis (" + elapsedNanoTimeInMillis
+ "ms) should NOT be less than minElapsedNanoTimeInMillis (" + minElapsedNanoTimeInMillis + "ms)");
} else if (elapsedNanoTimeInMillis > maxElapsedNanoTimeInMillis) {
} else if ((maxElapsedNanoTimeInMillis > 0) && (elapsedNanoTimeInMillis > maxElapsedNanoTimeInMillis)) {
result = false;
System.out.println("FAILED: " + testName + " elapsedNanoTimeInMillis (" + elapsedNanoTimeInMillis
+ "ms) should NOT be greater than maxElapsedNanoTimeInMillis (" + maxElapsedNanoTimeInMillis
Expand All @@ -84,6 +84,13 @@ public static boolean checkElapseTime(String testName, long startMillisTime, lon
return result;
}

// The maximum elapsed time is not always guaranteed on some platforms.
// https://github.com/eclipse-openj9/openj9/issues/18487#issuecomment-1829111868
public static boolean checkElapseTime(String testName, long startMillisTime, long startNanoTime,
JasonFengJ9 marked this conversation as resolved.
Show resolved Hide resolved
long minElapsedMillisTime, long minElapsedNanoTimeInMillis) {
return checkElapseTime(testName, startMillisTime, startNanoTime, minElapsedMillisTime, 0, minElapsedNanoTimeInMillis, 0);
}

private volatile boolean tasksPassed = true;
private volatile int taskRunning = 0;
private volatile int taskStarted = 0;
Expand Down Expand Up @@ -140,8 +147,7 @@ class TimeTestTask extends TimerTask {

public void run() {
taskExecuted++;
if (!checkElapseTime(testName, startMillisTime, startNanoTime, minElapsedMillisTime, maxElapsedMillisTime,
minElapsedNanoTimeInMillis, maxElapsedNanoTimeInMillis)) {
if (!checkElapseTime(testName, startMillisTime, startNanoTime, minElapsedMillisTime, minElapsedNanoTimeInMillis)) {
tasksPassed = false;
}
taskRunning--;
Expand Down
3 changes: 1 addition & 2 deletions test/functional/cmdLineTests/cmdLineTest_J9tests/src/ElapsedTime.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ private static void testElapsedTime() throws InterruptedException {
millisTimeStart = System.currentTimeMillis();
nanoTimeStart = System.nanoTime();
Thread.currentThread().sleep(100);
AssertJUnit.assertTrue(tu.checkElapseTime("testElapsedTime() sleep 100ms", millisTimeStart, nanoTimeStart, 100,
800, 100, 800));
AssertJUnit.assertTrue(tu.checkElapseTime("testElapsedTime() sleep 100ms", millisTimeStart, nanoTimeStart, 100, 100));

millisTimeStart = System.currentTimeMillis();
nanoTimeStart = System.nanoTime();
Expand Down
13 changes: 6 additions & 7 deletions test/functional/cmdLineTests/criu/src/org/openj9/criu/TimeChangeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,7 @@ private void testTimeCompensation() throws InterruptedException {
millisTimeStart = System.currentTimeMillis();
nanoTimeStart = System.nanoTime();
Thread.currentThread().sleep(100);
TimeUtilities.checkElapseTime("testTimeCompensation() sleep 100ms", millisTimeStart, nanoTimeStart, 100, 800,
100, 800);
TimeUtilities.checkElapseTime("testTimeCompensation() sleep 100ms", millisTimeStart, nanoTimeStart, 100, 100);

// this TimerTask is to run before CRIUR checkpoint
tu.timerSchedule("testTimeCompensation() preCheckpoint timer delayed 100ms", System.currentTimeMillis(),
Expand All @@ -151,7 +150,7 @@ private void testTimeCompensation() throws InterruptedException {
public void run() {
// check time elapsed within preCheckpoint hook
TimeUtilities.checkElapseTime("testTimeCompensation() preCheckpointHook", preCheckpointMillisTime,
preCheckpointNanoTime, 2000, 4000, 2000, 4000);
preCheckpointNanoTime, 2000, 2000);

// scheduled task can't run before the checkpoint because all threads are halted
// in single threaded mode except the current thread performing CRIU checkpoit
Expand All @@ -166,7 +165,7 @@ public void run() {
public void run() {
// check time elapsed within postRestore hook
TimeUtilities.checkElapseTime("testTimeCompensation() postRestoreHook", preCheckpointMillisTime,
preCheckpointNanoTime, 4000, 8000, 2000, 4000);
preCheckpointNanoTime, 4000, 2000);

tu.timerSchedule("testTimeCompensation() postRestoreHook timer delayed 10ms",
System.currentTimeMillis(), System.nanoTime(), 10, 800, 9, 800, 10);
Expand All @@ -176,12 +175,12 @@ public void run() {
});

TimeUtilities.checkElapseTime("testTimeCompensation() preCheckpoint", preCheckpointMillisTime,
preCheckpointNanoTime, 2000, 3000, 2000, 3000);
preCheckpointNanoTime, 2000, 2000);

CRIUTestUtils.checkPointJVMNoSetup(criu, CRIUTestUtils.imagePath, false);

TimeUtilities.checkElapseTime("testTimeCompensation() after CRIU restore", preCheckpointMillisTime,
preCheckpointNanoTime, 2000, 6000, 2000, 6000);
preCheckpointNanoTime, 2000, 2000);

CRIUTestUtils.showThreadCurrentTime("testTimeCompensation() postRestore");
final long postRestoreMillisTime = System.currentTimeMillis();
Expand All @@ -197,7 +196,7 @@ public void run() {
Thread.currentThread().sleep(2000);

TimeUtilities.checkElapseTime("testTimeCompensation() postRestore", postRestoreMillisTime, postRestoreNanoTime,
2000, 3000, 2000, 3000);
2000, 2000);

if (tu.getResultAndCancelTimers()) {
System.out.println("PASSED: " + "testTimeCompensation");
Expand Down