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.

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

[23.1] Backport --no-jlinking fixes from 24.0 #651

Merged
merged 21 commits into from
Dec 21, 2023

Conversation

jerboaa
Copy link
Collaborator

@jerboaa jerboaa commented Dec 20, 2023

This PR does the following things:

This now removes the old agent-based native image build in our 23.1.2 release, but it should be OK because it's unlikely any quarkus user is using it. It's a needed change in order to not drag in some ByteBuffer classes into the image heap when generating the native image agent.

jerboaa and others added 21 commits December 20, 2023 16:34
Use the approach of 24.0 instead.

This reverts commit 588ae3a.
(cherry picked from commit 4711d66)
(cherry picked from commit 8882a7c)
…geModulePath is empty

(cherry picked from commit ffdd704)
(cherry picked from commit b764ee7)
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Dec 20, 2023
@jerboaa
Copy link
Collaborator Author

jerboaa commented Dec 21, 2023

The two test failures are:

Q IT Data 5:

[INFO] -------------------------------------------------------
[INFO]  T E S T S
[INFO] -------------------------------------------------------
[INFO] Running io.quarkus.it.jpa.postgresql.ImageMetricsITCase
Executing "/home/runner/work/mandrel/mandrel/quarkus/integration-tests/jpa-postgresql-withxml/target/quarkus-integration-test-jpa-postgresql-withxml-999-SNAPSHOT-runner -Dquarkus.http.port=8081 -Dquarkus.http.ssl-port=8444 -Dtest.url=http://localhost:8081 -Dquarkus.log.file.path=/home/runner/work/mandrel/mandrel/quarkus/integration-tests/jpa-postgresql-withxml/target/quarkus.log -Dquarkus.log.file.enable=true -Dquarkus.log.category."io.quarkus".level=INFO -Dquarkus.native.native-image-xmx=5g"
[...]
Error:  Tests run: 1, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 5.331 s <<< FAILURE! -- in io.quarkus.it.jpa.postgresql.ImageMetricsITCase
Error:  io.quarkus.it.jpa.postgresql.ImageMetricsITCase.verifyImageMetrics -- Time elapsed: 0.252 s <<< FAILURE!
org.opentest4j.AssertionFailedError: Expected analysis_results.fields.jni to be within range [59 +- 1%] but was 60 ==> expected: <true> but was: <false>
	at org.junit.jupiter.api.AssertionFailureBuilder.build(AssertionFailureBuilder.java:151)
	at org.junit.jupiter.api.AssertionFailureBuilder.buildAndThrow(AssertionFailureBuilder.java:132)
	at org.junit.jupiter.api.AssertTrue.failNotTrue(AssertTrue.java:63)
	at org.junit.jupiter.api.AssertTrue.assertTrue(AssertTrue.java:36)
	at org.junit.jupiter.api.Assertions.assertTrue(Assertions.java:214)
	at io.quarkus.test.junit.nativeimage.NativeBuildOutputExtension.assertValueWithinRange(NativeBuildOutputExtension.java:90)
	at io.quarkus.test.junit.nativeimage.NativeBuildOutputExtension.lambda$verifyImageMetrics$0(NativeBuildOutputExtension.java:66)
	at java.base/java.util.concurrent.ConcurrentHashMap.forEach(ConcurrentHashMap.java:1603)
	at java.base/java.util.Properties.forEach(Properties.java:1422)
	at io.quarkus.test.junit.nativeimage.NativeBuildOutputExtension.verifyImageMetrics(NativeBuildOutputExtension.java:59)
	at io.quarkus.test.junit.nativeimage.NativeBuildOutputExtension.verifyImageMetrics(NativeBuildOutputExtension.java:46)
	at io.quarkus.it.jpa.postgresql.ImageMetricsITCase.verifyImageMetrics(ImageMetricsITCase.java:15)
	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)

=> Looks like we need a fix similar to quarkusio/quarkus#37813, but for jpa-postgresql-withxml. PR for this here: quarkusio/quarkus#37879

Q IT Main:

 Error:  Tests run: 5, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.021 s <<< FAILURE! -- in io.quarkus.it.main.QuarkusTestCallbacksITCase
Error:  io.quarkus.it.main.QuarkusTestCallbacksITCase.testCallbackContextIsNotFailed -- Time elapsed: 0.002 s <<< FAILURE!
org.opentest4j.AssertionFailedError: expected: <false> but was: <true>
	at org.junit.jupiter.api.AssertionFailureBuilder.build(AssertionFailureBuilder.java:151)
	at org.junit.jupiter.api.AssertionFailureBuilder.buildAndThrow(AssertionFailureBuilder.java:132)
	at org.junit.jupiter.api.AssertFalse.failNotFalse(AssertFalse.java:63)
	at org.junit.jupiter.api.AssertFalse.assertFalse(AssertFalse.java:36)
	at org.junit.jupiter.api.AssertFalse.assertFalse(AssertFalse.java:31)
	at org.junit.jupiter.api.Assertions.assertFalse(Assertions.java:231)
	at io.quarkus.it.main.QuarkusTestCallbacksITCase.testCallbackContextIsNotFailed(QuarkusTestCallbacksITCase.java:61)
	at java.base/java.lang.reflect.Method.invoke(Method.java:568)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)
	at java.base/java.util.ArrayList.forEach(ArrayList.java:1511)

=> quarkusio/quarkus#37809

@jerboaa
Copy link
Collaborator Author

jerboaa commented Dec 21, 2023

Re-running CI so as to verify that quarkusio/quarkus#37879 fixed the IT Data 5 failure.

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

Lerge merge it once the CI run ends.

@jerboaa
Copy link
Collaborator Author

jerboaa commented Dec 21, 2023

Only the one known failure of IT main remained. That's: quarkusio/quarkus#37809 Merging.

@jerboaa jerboaa merged commit 0124be0 into graalvm:mandrel/23.1 Dec 21, 2023
66 of 67 checks passed
@zakkak zakkak added this to the 23.1.2.0-Final milestone Dec 21, 2023
@zakkak zakkak added the affects/JDK17 JDK17 related label Dec 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
affects/JDK21 affects/23.1 OCA Verified All contributors have signed the Oracle Contributor Agreement.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants