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

8305819: LogConfigurationTest intermittently fails on AArch64 #2460

Closed
wants to merge 1 commit into from

Conversation

mmyxym
Copy link

@mmyxym mmyxym commented May 13, 2024

Hi all,

This pull request contains a backport of commit 911cc7cb from the openjdk/jdk repository.

It fixed a logging crash due to arm weak memory model.

The commit being backported was authored by gaogao-mem on 15 May 2023 and was reviewed by Andrew Haley, David Holmes and Xin Liu.

The conflicts only come from the difference of "NULL" and "nullptr".

Additional testing:

  • Verified the test case in original PR.

Thanks!


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8305819 needs maintainer approval

Issue

  • JDK-8305819: LogConfigurationTest intermittently fails on AArch64 (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/2460/head:pull/2460
$ git checkout pull/2460

Update a local copy of the PR:
$ git checkout pull/2460
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/2460/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2460

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/2460.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 13, 2024

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

@openjdk
Copy link

openjdk bot commented May 13, 2024

@mmyxym This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8305819: LogConfigurationTest intermittently fails on AArch64

Reviewed-by: mdoerr

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 11 new commits pushed to the master branch:

  • db04c7b: 8299023: TestPLABResize.java and TestPLABPromotion.java are failing intermittently
  • 68caeca: 8326591: New test JmodExcludedFiles.java fails on Windows when --with-external-symbols-in-bundles=public is used
  • d2b9c01: 8302907: [PPC64] Use more constexpr in class Register
  • e0dba38: 8280835: jdk/javadoc/tool/CheckManPageOptions.java depends on source hierarchy
  • 8f0fa10: 8267796: vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/TestDescription.java fails with NoClassDefFoundError
  • e2791f3: 8286490: JvmtiEventControllerPrivate::set_event_callbacks CLEARING_MASK computation is incorrect
  • f789e38: 8307423: [s390x] Represent Registers as values
  • bf4b15c: 8321925: sun/security/mscapi/KeytoolChangeAlias.java fails with "Alias <246810> does not exist"
  • ce1fb02: 8311964: Some jtreg tests failing on x86 with error 'unrecognized VM options' (C2 flags)
  • 606c542: 8326201: [S390] Need to bailout cleanly if creation of stubs fails when code cache is out of space
  • ... and 1 more: https://git.openjdk.org/jdk17u-dev/compare/20c2511f54bbae0d41f8750f5e02c6b59630d66f...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@TheRealMDoerr) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot changed the title Backport 911cc7cb07ed44b24b4c20977d7d6e475bd1b234 8305819: LogConfigurationTest intermittently fails on AArch64 May 13, 2024
@openjdk
Copy link

openjdk bot commented May 13, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels May 13, 2024
@mlbridge
Copy link

mlbridge bot commented May 13, 2024

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented May 13, 2024

⚠️ @mmyxym This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@mmyxym
Copy link
Author

mmyxym commented May 14, 2024

/approval request backport of fixing crash due to weak memory model. Conflicts come from the difference of "NULL" and "nullptr". Risk is very low.

@openjdk
Copy link

openjdk bot commented May 14, 2024

@mmyxym
8305819: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels May 14, 2024
@mmyxym
Copy link
Author

mmyxym commented May 16, 2024

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label May 16, 2024
@openjdk
Copy link

openjdk bot commented May 16, 2024

@mmyxym
Your change (at version 1acc448) is now ready to be sponsored by a Committer.

@mmyxym
Copy link
Author

mmyxym commented May 16, 2024

Could committers please help to sponsor?

@TheRealMDoerr
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented May 16, 2024

Going to push as commit 18bb8da.
Since your change was applied there have been 12 commits pushed to the master branch:

  • 0a3445e: 8331942: On Linux aarch64, CDS archives should be using 64K alignment by default
  • db04c7b: 8299023: TestPLABResize.java and TestPLABPromotion.java are failing intermittently
  • 68caeca: 8326591: New test JmodExcludedFiles.java fails on Windows when --with-external-symbols-in-bundles=public is used
  • d2b9c01: 8302907: [PPC64] Use more constexpr in class Register
  • e0dba38: 8280835: jdk/javadoc/tool/CheckManPageOptions.java depends on source hierarchy
  • 8f0fa10: 8267796: vmTestbase/nsk/jvmti/scenarios/hotswap/HS201/hs201t002/TestDescription.java fails with NoClassDefFoundError
  • e2791f3: 8286490: JvmtiEventControllerPrivate::set_event_callbacks CLEARING_MASK computation is incorrect
  • f789e38: 8307423: [s390x] Represent Registers as values
  • bf4b15c: 8321925: sun/security/mscapi/KeytoolChangeAlias.java fails with "Alias <246810> does not exist"
  • ce1fb02: 8311964: Some jtreg tests failing on x86 with error 'unrecognized VM options' (C2 flags)
  • ... and 2 more: https://git.openjdk.org/jdk17u-dev/compare/20c2511f54bbae0d41f8750f5e02c6b59630d66f...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 16, 2024
@openjdk openjdk bot closed this May 16, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels May 16, 2024
@openjdk
Copy link

openjdk bot commented May 16, 2024

@TheRealMDoerr @mmyxym Pushed as commit 18bb8da.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants