Merge jdk-23+37

[rvansa]

trafficstars

This merges the release candidate tag 23+37 into CRaC, expecting that we will baseline on 23 soon.

Most of the conflicts to resolve were trivial, one place worth attention is LinuxAttachListener+LinuxAttachOperation that were refactored in CRaC and in upstream renamed to PosixAttachListener+PosixAttachOperation. Second set of conflicts appeared in CPU features handling.

---

Progress

• [x] Change must not contain extraneous whitespace

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/crac.git pull/156/head:pull/156
$ git checkout pull/156

Update a local copy of the PR:
$ git checkout pull/156
$ git pull https://git.openjdk.org/crac.git pull/156/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 156

View PR using the GUI difftool:
$ git pr show -t 156

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/crac/pull/156.diff

Webrev

Link to Webrev Comment

[bridgekeeper[bot]]

:wave: Welcome back rvansa! A progress list of the required criteria for merging this PR into crac will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk[bot]]

@rvansa This change is no longer ready for integration - check the PR body for details.

[rvansa]

Some of the test failures (on x86_64 and macos) are intermittent failures, should be fixed independently. There are failures on x86 (32bit), I could reproduce some container related tests - there were some 32-bit libraries missing in the system (though the failure does not reproduce all the time). Also TestStackOverflowDuringInit has some fixes in the downstream; these will be applied as a follow-up.

[mlbridge[bot]]

Webrevs

• 01: Full (2051e8c6)
• 00: Merge target (crac) - Merge source (jdk-23+37) (2051e8c6)

[mlbridge[bot]]

Mailing list message from Anton Kozlov on crac-dev:

On 8/30/24 2:26 PM, Radim Vansa wrote:

The PR is too big for github to visualize it. I'm reviewing the difference with jdk-23+37:

diff --git a/make/autoconf/Makefile.template b/make/autoconf/Makefile.template index 4cb5057c05c..a1baff3395c 100644 --- a/make/autoconf/Makefile.template +++ b/make/autoconf/Makefile.template @@ -21,7 +21,16 @@ # questions. #

-# This Makefile was generated by configure @DATE_WHEN_CONFIGURED@ -# GENERATED FILE, DO NOT EDIT -SPEC:=@OUTPUTDIR@/spec.gmk -include @WORKSPACE_ROOT@/Makefile +AsyncGetCallTrace +jio_fprintf +jio_printf +jio_snprintf +jio_vfprintf +jio_vsnprintf +JNI_CreateJavaVM +JNI_GetCreatedJavaVMs +JNI_GetDefaultJavaVMInitArgs +JVM_IsForeignLinkerSupported +JVM_FindClassFromBootLoader +JVM_InitAgentProperties +JVM_Checkpoint

This seems to be mis-merge.

---

commit 20975f6d3ddc8d5475476c0909ee3e20c05c60ef Author: Radim Vansa <rvansa at azul.com> Date: Thu Aug 29 17:36:57 2024 +0200

Build jdk/test/lib/containers/docker for tests

diff --git a/make/test/BuildTestLib.gmk b/make/test/BuildTestLib.gmk index d48f263f6f9..2298fc734c5 100644 --- a/make/test/BuildTestLib.gmk +++ b/make/test/BuildTestLib.gmk @@ -60,7 +60,7 @@ TARGETS += $(BUILD_WB_JAR) $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \ TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \ SRC := $(TEST_LIB_SOURCE_DIR), \ - EXCLUDES := jdk/test/lib/containers jdk/test/lib/security, \ + EXCLUDES := jdk/test/lib/containers/cgroup jdk/test/lib/security, \ BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \ HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \ JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \ diff --git a/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java b/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java index fc3b793c47a..3f1e4c3b69b 100644 --- a/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java +++ b/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java @@ -59,10 +59,10 @@ public DockerRunOptions(String imageNameAndTag, String javaCmd, this.imageNameAndTag = imageNameAndTag; this.command = javaCmd; this.classToRun = classToRun; - this.addJavaOpts(javaOpts); + Collections.addAll(this.javaOpts, javaOpts); // always print hserr to stderr in the docker tests to avoid // trouble accessing it after a crash in the container - this.addJavaOpts("-XX:+ErrorFileToStderr"); + Collections.addAll(this.javaOpts, "-XX:+ErrorFileToStderr"); }

public DockerRunOptions addDockerOpts(String... opts) {

The reason for this change is not clear, it seems to be this PR specific, but it is not CRaC-specific. Better to be done as a follow-up change.

In the rest, LGTM. Thank you!

-- Anton

[bridgekeeper[bot]]

@rvansa This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

[bridgekeeper[bot]]

@rvansa This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

[bridgekeeper[bot]]

@rvansa This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

[bridgekeeper[bot]]

@rvansa This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

[openjdk[bot]]

@rvansa this pull request can not be integrated into crac due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout openjdk_23_37
git fetch https://git.openjdk.org/crac.git crac
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge crac"
git push

[rvansa]

Superseded by #159