Merge pull request #18425 from JasonFengJ9/mxbeanuptime

CRIU tests get accurate pre-checkpoint time

runtime/criusupport/criusupport.cpp

@@ -656,13 +656,13 @@ Java_org_eclipse_openj9_criu_CRIUSupport_checkpointJVMImpl(JNIEnv *env,
 	bool setupCRIU = true;
 	PORT_ACCESS_FROM_VMC(currentThread);
 
+	Trc_CRIU_checkpointJVMImpl_Entry(currentThread);
 	if (NULL == vm->checkpointState.criuJVMCheckpointExceptionClass) {
 		setupCRIU = setupJNIFieldIDsAndCRIUAPI(env, &currentExceptionClass, &systemReturnCode, &nlsMsgFormat);
 	}
 
 	vm->checkpointState.checkpointThread = currentThread;
 
-	Trc_CRIU_checkpointJVMImpl_Entry(currentThread);
 	if (vmFuncs->isCheckpointAllowed(currentThread) && setupCRIU) {
 #if defined(LINUX)
 		j9object_t cpDir = NULL;

test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIUTestUtils.java

@@ -82,35 +82,33 @@ public static void checkPointJVM(CRIUSupport criu, Path path, boolean deleteDir)
 				deleteCheckpointDirectory(path);
 			}
 		} else {
-			System.err.println("CRIU is not enabled");
+			throw new RuntimeException("CRIU is not enabled");
 		}
 	}
 
 	public static CRIUSupport prepareCheckPointJVM(Path path) {
-		CRIUSupport criu = null;
 		if (CRIUSupport.isCRIUSupportEnabled()) {
 			deleteCheckpointDirectory(path);
 			createCheckpointDirectory(path);
-			criu = new CRIUSupport(path);
+			return (new CRIUSupport(path)).setLeaveRunning(false).setShellJob(true).setFileLocks(true);
 		} else {
-			System.err.println("CRIU is not enabled");
+			throw new RuntimeException("CRIU is not enabled");
 		}
-		return criu;
 	}
 
 	public static void checkPointJVMNoSetup(CRIUSupport criu, Path path, boolean deleteDir) {
 		if (criu != null) {
 			try {
 				showThreadCurrentTime("Performing CRIUSupport.checkpointJVM()");
-				criu.setLeaveRunning(false).setShellJob(true).setFileLocks(true).checkpointJVM();
+				criu.checkpointJVM();
 			} catch (SystemRestoreException e) {
 				e.printStackTrace();
 			}
 			if (deleteDir) {
 				deleteCheckpointDirectory(path);
 			}
 		} else {
-			System.err.println("CRIU is not enabled");
+			throw new RuntimeException("CRIU is not enabled");
 		}
 	}
 

test/functional/cmdLineTests/criu/src/org/openj9/criu/JDK11UpTimeoutAdjustmentTest.java

@@ -48,9 +48,6 @@ public static void main(String[] args) throws InterruptedException {
 
 	private void test(String testName) throws InterruptedException {
 		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
-		if (criu == null) {
-			return;
-		}
 		System.out.println("Start test name: " + testName);
 		CRIUTestUtils.showThreadCurrentTime("Before starting " + testName);
 		switch (testName) {

test/functional/cmdLineTests/criu/src/org/openj9/criu/TestConcurrentMode.java

@@ -75,10 +75,6 @@ public static void main(String[] args) {
 	static void TestConcurrentModePreCheckpointHookThrowException() {
 		CRIUTestUtils.showThreadCurrentTime("TestConcurrentModePreCheckpointHookThrowException() starts ..");
 		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
-		if (criu == null) {
-			// "CRIU is not enabled" is to appear and cause the test failure.
-			return;
-		}
 		criu.registerPreCheckpointHook(() -> {
 			throw new RuntimeException("TestConcurrentModePreCheckpointHookThrowException() within preCheckpointHook");
 		}, CRIUSupport.HookMode.CONCURRENT_MODE, USER_HOOK_MODE_PRIORITY_LOW);
@@ -92,10 +88,6 @@ static void TestConcurrentModePreCheckpointHookThrowException() {
 	static void TestConcurrentModePreCheckpointHookThrowExceptionPriority() {
 		CRIUTestUtils.showThreadCurrentTime("TestConcurrentModePreCheckpointHookThrowExceptionPriority() starts ..");
 		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
-		if (criu == null) {
-			// "CRIU is not enabled" is to appear and cause the test failure.
-			return;
-		}
 		criu.registerPreCheckpointHook(
 				() -> CRIUTestUtils.showThreadCurrentTime("TestConcurrentModePreCheckpointHookThrowExceptionPriority() within preCheckpointHook"),
 				CRIUSupport.HookMode.CONCURRENT_MODE, 100);
@@ -109,10 +101,6 @@ static void TestConcurrentModePreCheckpointHookThrowExceptionPriority() {
 	static void TestConcurrentModePreCheckpointHookRunOnce() {
 		CRIUTestUtils.showThreadCurrentTime("TestConcurrentModePreCheckpointHookRunOnce() starts ..");
 		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
-		if (criu == null) {
-			// "CRIU is not enabled" is to appear and cause the test failure.
-			return;
-		}
 		criu.registerPreCheckpointHook(
 				() -> CRIUTestUtils.showThreadCurrentTime("TestConcurrentModePreCheckpointHookRunOnce() within preCheckpointHook"),
 				CRIUSupport.HookMode.CONCURRENT_MODE, USER_HOOK_MODE_PRIORITY_LOW);
@@ -126,10 +114,6 @@ static void TestConcurrentModePreCheckpointHookRunOnce() {
 	static void TestConcurrentModePreCheckpointHookPriorities() {
 		CRIUTestUtils.showThreadCurrentTime("TestConcurrentModePreCheckpointHookPriorities() starts ..");
 		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
-		if (criu == null) {
-			// "CRIU is not enabled" is to appear and cause the test failure.
-			return;
-		}
 		final TestResult testResult = new TestResult(true, 0);
 		criu.registerPreCheckpointHook(() -> {
 			CRIUTestUtils.showThreadCurrentTime("The preCheckpointHook with lower priority in CONCURRENT_MODE");
@@ -190,10 +174,6 @@ static void TestConcurrentModePreCheckpointHookPriorities() {
 	static void TestConcurrentModePostRestoreHookThrowException() {
 		CRIUTestUtils.showThreadCurrentTime("TestConcurrentModePostRestoreHookThrowException() starts ..");
 		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
-		if (criu == null) {
-			// "CRIU is not enabled" is to appear and cause the test failure.
-			return;
-		}
 		criu.registerPostRestoreHook(() -> {
 			throw new RuntimeException("TestConcurrentModePostRestoreHookThrowException() within postRestoreHook");
 		}, CRIUSupport.HookMode.CONCURRENT_MODE, 1);
@@ -207,10 +187,6 @@ static void TestConcurrentModePostRestoreHookThrowException() {
 	static void TestConcurrentModePostRestoreHookThrowExceptionPriority() {
 		CRIUTestUtils.showThreadCurrentTime("TestConcurrentModePostRestoreHookThrowExceptionPriority() starts ..");
 		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
-		if (criu == null) {
-			// "CRIU is not enabled" is to appear and cause the test failure.
-			return;
-		}
 		criu.registerPostRestoreHook(
 				() -> CRIUTestUtils.showThreadCurrentTime("TestConcurrentModePostRestoreHookRunOnce() within postRestoreHook"),
 				CRIUSupport.HookMode.CONCURRENT_MODE, -1);
@@ -224,10 +200,6 @@ static void TestConcurrentModePostRestoreHookThrowExceptionPriority() {
 	static void TestConcurrentModePostRestoreHookRunOnce() {
 		CRIUTestUtils.showThreadCurrentTime("TestConcurrentModePostRestoreHookRunOnce() starts ..");
 		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
-		if (criu == null) {
-			// "CRIU is not enabled" is to appear and cause the test failure.
-			return;
-		}
 		criu.registerPostRestoreHook(
 				() -> CRIUTestUtils.showThreadCurrentTime("TestConcurrentModePostRestoreHookRunOnce() within postRestoreHook"),
 				CRIUSupport.HookMode.CONCURRENT_MODE, 1);
@@ -241,10 +213,6 @@ static void TestConcurrentModePostRestoreHookRunOnce() {
 	static void TestConcurrentModePostRestoreHookPriorities() {
 		CRIUTestUtils.showThreadCurrentTime("TestConcurrentModePostRestoreHookPriorities() starts ..");
 		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
-		if (criu == null) {
-			// "CRIU is not enabled" is to appear and cause the test failure.
-			return;
-		}
 		final TestResult testResult = new TestResult(true, 0);
 		criu.registerPostRestoreHook(() -> {
 			CRIUTestUtils.showThreadCurrentTime("The postRestoreHook with lower priority in CONCURRENT_MODE");

test/functional/cmdLineTests/criu/src/org/openj9/criu/TestMachineResourceChange.java

@@ -97,10 +97,6 @@ private void testVirtualThreadForkJoinPoolParallelism(boolean isCheckpoint, bool
 
 	private void test(String testName) throws InterruptedException {
 		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
-		if (criu == null) {
-			// prepareCheckPointJVM() has an error message "CRIU is not enabled".
-			return;
-		}
 		CRIUTestUtils.showThreadCurrentTime("Before starting " + testName);
 		switch (testName) {
 		case "testVirtualThreadForkJoinPoolParallelism":

test/functional/cmdLineTests/criu/src/org/openj9/criu/TestSingleThreadModeCheckpointException.java

@@ -77,10 +77,6 @@ void testSingleThreadModeCheckpointExceptionJUCLock() {
 		CRIUTestUtils.showThreadCurrentTime("testSingleThreadModeCheckpointExceptionJUCLock() before ReentrantLock.lock()");
 		jucLock.lock();
 		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
-		if (criu == null) {
-			// "CRIU is not enabled" is to appear and cause the test failure.
-			return;
-		}
 
 		try {
 			// ensure the lock already taken before performing a checkpoint
@@ -131,10 +127,6 @@ void testSingleThreadModeCheckpointExceptionSynLock() {
 				"testSingleThreadModeCheckpointExceptionSynLock() before synchronized on " + synLock);
 		synchronized (synLock) {
 			CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
-			if (criu == null) {
-				// "CRIU is not enabled" is to appear and cause the test failure.
-				return;
-			}
 
 			try {
 				// ensure the lock already taken before performing a checkpoint

test/functional/cmdLineTests/criu/src/org/openj9/criu/TestSingleThreadModeRestoreException.java

@@ -82,10 +82,6 @@ void testSingleThreadModeRestoreExceptionJUCLock() {
 		CRIUTestUtils.showThreadCurrentTime("testSingleThreadModeRestoreExceptionJUCLock() before ReentrantLock.lock()");
 		jucLock.lock();
 		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
-		if (criu == null) {
-			// "CRIU is not enabled" is to appear and cause the test failure.
-			return;
-		}
 
 		try {
 			// ensure the lock already taken before performing a checkpoint
@@ -139,10 +135,6 @@ void testSingleThreadModeRestoreExceptionSynLock() {
 				"testSingleThreadModeRestoreExceptionSynLock() before synchronized on " + synLock);
 		synchronized (synLock) {
 			CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
-			if (criu == null) {
-				// "CRIU is not enabled" is to appear and cause the test failure.
-				return;
-			}
 
 			try {
 				// ensure the lock already taken before performing a checkpoint

test/functional/cmdLineTests/criu/src/org/openj9/criu/TimeChangeTest.java

@@ -47,7 +47,6 @@ public class TimeChangeTest {
 	private final static long MILLIS_DELAY_AFTERCHECKPOINTDONE = 5000;
 	private final long startNanoTime = System.nanoTime();
 	private final long currentTimeMillis = System.currentTimeMillis();
-	private final static Path imagePath = Paths.get("cpData");
 
 	public static void main(String args[]) throws InterruptedException {
 		if (args.length == 0) {
@@ -82,6 +81,7 @@ public static void main(String args[]) throws InterruptedException {
 	}
 
 	private void test(String testName) throws InterruptedException {
+		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
 		System.out.println("Start test name: " + testName);
 		showThreadCurrentTime("Before starting " + testName);
 		Timer timer = new Timer();
@@ -101,7 +101,7 @@ private void test(String testName) throws InterruptedException {
 		default:
 			throw new RuntimeException("Unrecognized test name: " + testName);
 		}
-		CRIUTestUtils.checkPointJVM(imagePath, false);
+		CRIUTestUtils.checkPointJVMNoSetup(criu, CRIUTestUtils.imagePath, false);
 		// maximum test running time is 12s
 		Thread.sleep(12000);
 		showThreadCurrentTime("End " + testName);
@@ -209,9 +209,10 @@ public void run() {
 	}
 
 	public void testSystemNanoTime() {
+		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
 		final long beforeCheckpoint = System.nanoTime();
 		System.out.println("System.nanoTime() before CRIU checkpoint: " + beforeCheckpoint);
-		CRIUTestUtils.checkPointJVM(imagePath, false);
+		CRIUTestUtils.checkPointJVMNoSetup(criu, CRIUTestUtils.imagePath, false);
 		final long afterRestore = System.nanoTime();
 		final long elapsedTime = afterRestore - beforeCheckpoint;
 		if (elapsedTime < MAX_TARDINESS_NS) {
@@ -229,8 +230,9 @@ private void testGetLastRestoreTime() {
 			System.out.println("FAILED: InternalCRIUSupport.getLastRestoreTime() - " + lastRestoreTime
 					+ " should be -1 before restore");
 		}
+		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
 		long beforeCheckpoint = System.currentTimeMillis();
-		CRIUTestUtils.checkPointJVM(imagePath, false);
+		CRIUTestUtils.checkPointJVMNoSetup(criu, CRIUTestUtils.imagePath, false);
 		lastRestoreTime = InternalCRIUSupport.getLastRestoreTime();
 		long afterRestore = System.currentTimeMillis();
 		if (beforeCheckpoint >= lastRestoreTime) {
@@ -247,36 +249,33 @@ private void testGetLastRestoreTime() {
 	}
 
 	private void testMXBeanUpTime() {
+		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
 		RuntimeMXBean mxb = ManagementFactory.getRuntimeMXBean();
 		long uptimeBeforeCheckpoint = mxb.getUptime();
-		CRIUTestUtils.checkPointJVM(imagePath, false);
+		CRIUTestUtils.checkPointJVMNoSetup(criu, CRIUTestUtils.imagePath, false);
 		long uptimeAfterCheckpoint = mxb.getUptime();
-		// UpTime adjustment less than the JVM down time 2s.
-		long adjustMillis = 1500;
 
 		if (uptimeAfterCheckpoint <= uptimeBeforeCheckpoint) {
 			System.out.println("FAILED: testMXBeanUpTime() - uptimeAfterCheckpoint " + uptimeAfterCheckpoint
 					+ " can't be less than uptimeBeforeCheckpoint " + uptimeBeforeCheckpoint);
-		} else if (uptimeAfterCheckpoint >= (uptimeBeforeCheckpoint + adjustMillis)) {
-			System.out.println("FAILED: testMXBeanUpTime() - uptimeAfterCheckpoint " + uptimeAfterCheckpoint
-					+ " can't be greater than uptimeBeforeCheckpoint " + uptimeBeforeCheckpoint + " + " + adjustMillis);
 		} else {
 			System.out.println("PASSED: testMXBeanUpTime() - uptimeAfterCheckpoint " + uptimeAfterCheckpoint
-					+ " is less than uptimeBeforeCheckpoint " + uptimeBeforeCheckpoint + " + "
-					+ adjustMillis);
+					+ " is greater than uptimeBeforeCheckpoint " + uptimeBeforeCheckpoint);
 		}
 	}
 
 	public void testSystemNanoTimeJitPreCheckpointCompile() {
+		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
 		testSystemNanoTimeJitTestPreCheckpointPhase();
 		testSystemNanoTimeJitWarmupPhase();
-		CRIUTestUtils.checkPointJVM(imagePath, false);
+		CRIUTestUtils.checkPointJVMNoSetup(criu, CRIUTestUtils.imagePath, false);
 		testSystemNanoTimeJitTestPostCheckpointPhase();
 	}
 
 	public void testSystemNanoTimeJitPostCheckpointCompile() {
+		CRIUSupport criu = CRIUTestUtils.prepareCheckPointJVM(CRIUTestUtils.imagePath);
 		testSystemNanoTimeJitTestPreCheckpointPhase();
-		CRIUTestUtils.checkPointJVM(imagePath, false);
+		CRIUTestUtils.checkPointJVMNoSetup(criu, CRIUTestUtils.imagePath, false);
 		testSystemNanoTimeJitWarmupPhase();
 		testSystemNanoTimeJitTestPostCheckpointPhase();
 	}