(v0.38.0-release) Support for restore args env var & CRIU getRestoreSystemProperites() skips non system property entries #16880
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This PR builds on the existing support for EnvVars (see eclipse-openj9#13545) by recognizing a special env var OPENJ9_RESTORE_JAVA_OPTIONS which can be used to specify JVM options at upon JVM restore. This env var is ignored when -XX:+EnableCRIUSupport is not specified and it is also ignored at startup. Documentation will be added later to describe what kind of options can be specified upon restore. Initially all options will be parsed, but this PR only supports the addition of Java properties, all other options will be ignored. All options are placed in the vm->checkpointState.restoreArgsList, this is what the JVM components (VM, JIT, GC) will look at to extract restore options. This PR parses the JVM options before any Java code is run upon restore so that the JVM can act on the changes immediately. A tracepoint is added to display all the restore options (-Xtrace:print=j9criu.16), further support will be added to javadump. A restore option "-XX:+IgnoreUnrecognizedRestoreOptions" is added, this option notifies the JVM to ignore any options that are not supported on restore. Without this option the JVM will throw a restore exception if an unsupported option is specified. Related: eclipse-openj9#15844 Closes: eclipse-openj9#15839 Signed-off-by: Tobi Ajila <atobia@ca.ibm.com>
The index is only for the system property entries; Mark -Xoptionsfile= as consumed; Added explicit failure exception and error messages. Signed-off-by: Jason Feng <fengj@ca.ibm.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-pick two PRs