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

Jump to bottom

[23.0] [backport] [GR-46536] Add jdk.internal.platform to built-in package natives. #768

Merged
merged 4 commits into from
Jul 15, 2024
Merged

[23.0] [backport] [GR-46536] Add jdk.internal.platform to built-in package natives. #768

merged 4 commits into from
Jul 15, 2024

Conversation

jerboaa
Copy link
Collaborator

@jerboaa jerboaa commented Jul 15, 2024

Backport of oracle#6751 in order to fix this mandrel integration test issue:
Karm/mandrel-integration-tests#271

Closes: Karm/mandrel-integration-tests#271

zakkak and others added 4 commits July 15, 2024 16:35
@zakkak @jerboaa
Add jdk.internal.platform to built-in package natives
7e82738 
Enables invocations to
`jdk.internal.platform.CgroupMetrics#getTotalSwapSize0` introduced by
JDK-8299858

Closes: oracle#6739
(cherry picked from commit b430cb1)
@zakkak @jerboaa
Revert "Add support for CgroupMetrics.getTotalMemory0"
9199c37 
This reverts commit 3dcf7c7.

(cherry picked from commit 5cc919c)
@fniephaus @jerboaa
Sort defaultBuiltInPkgNatives.
4155334 
(cherry picked from commit 8c12f00)
@fniephaus @jerboaa
Move jdk_internal_platform to defaultBuiltInPkgNatives.
1c2d729 
(cherry picked from commit ec0dd7f)
@jerboaa jerboaa added this to the 23.0.5.0-Final milestone Jul 15, 2024
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Jul 15, 2024
@jerboaa jerboaa mentioned this pull request Jul 15, 2024
Closed
@jerboaa jerboaa linked an issue Jul 15, 2024 that may be closed by this pull request
[23.0] JFRTest.jfrOptionsSmokeTest test failing with latest JDK 17.0.12 Karm/mandrel-integration-tests#271
Closed
@jerboaa jerboaa requested a review from zakkak July 15, 2024 14:53
zakkak
zakkak approved these changes Jul 15, 2024
View reviewed changes
Copy link
Collaborator

@zakkak zakkak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks @jerboaa !

@jerboaa
Copy link
Collaborator Author

jerboaa commented Jul 15, 2024

Mandrel IT test failure is:

 Error:  Failures: 
Error:    JFRTest.jfrPerfTest:185->jfrPerfTestRun:234 build-and-run.log log should not contain error or warning lines that are not whitelisted. See /home/runner/work/mandrel/mandrel/mandrel-integration-tests/testsuite/target/archived-logs/org.graalvm.tests.integration.JFRTest/jfrPerfTest/build-and-run.log and check these offending lines: 
Warning:  [io.quarkus.deployment.pkg.steps.NativeImageBuildStep] You are using an older version of GraalVM or Mandrel : 23.0.4.2-dev4d04e7cc. Quarkus currently supports 23.1.0. Please upgrade to this version. ==> expected: <true> but was: <false>

... which I thought we fixed with Karm/mandrel-integration-tests#263

Either way, it's unrelated.

@jerboaa
Copy link
Collaborator Author

jerboaa commented Jul 15, 2024

Karm/mandrel-integration-tests#274 should fix the missing allow list.

@zakkak zakkak merged commit 7a3fb68 into graalvm:mandrel/23.0 Jul 15, 2024
41 of 42 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zakkak zakkak zakkak approved these changes

Assignees
No one assigned
Labels
affects/JDK17 JDK17 related affects/23.0 backport OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Milestone
23.0.5.0-Final
Development

Successfully merging this pull request may close these issues.

[23.0] JFRTest.jfrOptionsSmokeTest test failing with latest JDK 17.0.12
3 participants
@jerboaa @zakkak @fniephaus