Merge pull request #17448 from JasonFengJ9/criunocache

CRIU restore clears InetAddress.cache
eclipse-openj9 · May 26, 2023 · 12286f5 · 12286f5
2 parents ec0eb13 + 662d82e
commit 12286f5
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/jcl/src/java.base/share/classes/module-info.java.extra b/jcl/src/java.base/share/classes/module-info.java.extra
@@ -61,12 +61,16 @@ uses com.ibm.gpu.spi.GPUAssist.Provider;
 exports com.ibm.gpu.spi to
     openj9.gpu;
 /*[IF CRIU_SUPPORT]*/
+/*[IF JAVA_SPEC_VERSION >= 17]*/
+exports jdk.internal.access to
+    openj9.criu;
+/*[ENDIF] JAVA_SPEC_VERSION >= 17 */
+exports jdk.internal.misc to
+    openj9.criu;
 exports openj9.internal.criu to
     openj9.criu;
 exports openj9.internal.criu.security to
     openj9.criu;
-exports jdk.internal.misc to
-    openj9.criu;
 opens jdk.internal.misc to
     openj9.criu;
 opens java.lang to

diff --git a/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/CRIUSupport.java b/jcl/src/openj9.criu/share/classes/org/eclipse/openj9/criu/CRIUSupport.java
@@ -45,6 +45,14 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 
+/*[IF JAVA_SPEC_VERSION >= 17]*/
+import jdk.internal.access.JavaNetInetAddressAccess;
+import jdk.internal.access.SharedSecrets;
+/*[ELSE] JAVA_SPEC_VERSION >= 17
+import jdk.internal.misc.JavaNetInetAddressAccess;
+import jdk.internal.misc.SharedSecrets;
+/*[ENDIF] JAVA_SPEC_VERSION >= 17 */
+
 import openj9.internal.criu.InternalCRIUSupport;
 
 /**
@@ -211,6 +219,7 @@ public static String getErrorMessage() {
 	/* Higher priority hooks are run last in pre-checkoint hooks, and are run
 	 * first in post restore hooks.
 	 */
+	private static final int RESTORE_CLEAR_INETADDRESS_CACHE_PRIORITY = 100;
 	private static final int RESTORE_ENVIRONMENT_VARIABLES_PRIORITY = 100;
 	private static final int RESTORE_SYSTEM_PROPERTIES_PRIORITY = 100;
 	private static final int USER_HOOKS_PRIORITY = 1;
@@ -623,6 +632,10 @@ private static void setRestoreJavaProperties() {
 		}
 	}
 
+	private static void clearInetAddressCache() {
+		SharedSecrets.getJavaNetInetAddressAccess().clearInetAddressCache();
+	}
+
 	/**
 	 * Checkpoint the JVM. This operation will use the CRIU options set by the
 	 * options setters.
@@ -647,6 +660,7 @@ public synchronized void checkpointJVM() {
 					registerRestoreEnvVariables();
 				}
 
+				J9InternalCheckpointHookAPI.registerPostRestoreHook(RESTORE_CLEAR_INETADDRESS_CACHE_PRIORITY, "Clear InetAddress cache on restore", CRIUSupport::clearInetAddressCache);
 				J9InternalCheckpointHookAPI.registerPostRestoreHook(RESTORE_ENVIRONMENT_VARIABLES_PRIORITY, "Restore system properties", CRIUSupport::setRestoreJavaProperties);
 
 				/* Add security provider hooks. */