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

8309218: java/util/concurrent/locks/Lock/OOMEInAQS.java still times out with ZGC, Generational ZGC, and SerialGC #17313

Closed
wants to merge 4 commits into from

Conversation

viktorklang-ora
Copy link
Contributor

@viktorklang-ora viktorklang-ora commented Jan 8, 2024

As per conversation in the issue.


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

Issue

  • JDK-8309218: java/util/concurrent/locks/Lock/OOMEInAQS.java still times out with ZGC, Generational ZGC, and SerialGC (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17313

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17313.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 8, 2024

👋 Welcome back vklang! 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 openjdk bot added the rfr Pull request is ready for review label Jan 8, 2024
@openjdk
Copy link

openjdk bot commented Jan 8, 2024

@viktorklang-ora The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Jan 8, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 8, 2024

Webrevs

@jaikiran
Copy link
Member

jaikiran commented Jan 9, 2024

Hello Viktor, the skara bot very helpfully has noted that this test has been problemlisted in a couple of files:

8309218 is used in problem lists: [test/jdk/ProblemList-zgc.txt, test/jdk/ProblemList-generational-zgc.txt]

so this current PR which is proposing to fix that test would have to remove it from those two problem lists.

@viktorklang-ora
Copy link
Contributor Author

@jaikiran Gah, you're obviously right, I've amended the problem lists and updated the copyright years there as well.

Copy link
Member

@jaikiran jaikiran left a comment

Choose a reason for hiding this comment

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

Hello Viktor, the changes look OK to me.

This test resides in tier1, so if not already done, then I would suggest running tier1 once to be sure there are no unexpected issues and given that this is a GC reliant test then additionally running only this test in the CI, with a --test-repeat of something like 50, might also be a good way to see if there any intermittent failures.

@openjdk
Copy link

openjdk bot commented Jan 10, 2024

@viktorklang-ora 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:

8309218: java/util/concurrent/locks/Lock/OOMEInAQS.java still times out with ZGC, Generational ZGC, and SerialGC

Reviewed-by: jpai, dholmes, alanb

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 95 new commits pushed to the master branch:

  • 8569227: 8322589: Add Ideal transformation: (~a) & (~b) => ~(a | b)
  • f4ca41a: 8322816: RISC-V: Incorrect guarantee in patch_vtype
  • 376051a: 8320919: Clarify Locale related system properties
  • a5071e0: 8322817: RISC-V: Eliminate -Wparentheses warnings in riscv code
  • 28d8149: 8323115: x86-32: Incorrect predicates for cmov instruct transforms with UseSSE
  • e9f7db3: 8322880: Eliminate -Wparentheses warnings in arm32 code
  • aba1933: 8323210: Update the usage of cmsFLAGS_COPY_ALPHA
  • f3be138: 8322809: SystemModulesMap::classNames and moduleNames arrays do not match the order
  • bc05893: 8323318: Remove unused Space::is_free_block
  • dd8ae61: 8322237: Heap dump contains duplicate thread records for mounted virtual threads
  • ... and 85 more: https://git.openjdk.org/jdk/compare/7eb25ec7b321abcd685bc761bd4c7cb110d52497...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 10, 2024
Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Looks good. Restricting to only using G1, which has not been failing, seems the best thing to do here.

Thanks.

Copy link
Contributor

@AlanBateman AlanBateman left a comment

Choose a reason for hiding this comment

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

The effect of @requires vm.gc.G1 is that the test won't be selected when there is a test run that uses a different GC. Make sense and I agree restricting this test to one GC make sense.

@viktorklang-ora
Copy link
Contributor Author

@jaikiran I've had it run tier1 (though not in a repeat loop), since the changes proposed here only affects the execution of the test and not changing the test itself, I thought it just made sense to have it run on tier1 once (after running the specific test itself on M5 100 times).

@jaikiran
Copy link
Member

@viktorklang-ora that sounds good to me.

@viktorklang-ora
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 10, 2024

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

  • 475306b: 7057369: (fs spec) FileStore getUsableSpace and getUnallocatedSpace could be clearer
  • f016934: 8323518: Parallel: Remove unused methods in psParallelCompact.hpp
  • 2174f66: 8323005: Parallel: Refactor PSPromotionManager::claim_or_forward_depth
  • 1617067: 8323331: fix typo hpage_pdm_size
  • 2806ade: 8321685: Missing ResourceMark in code called from JvmtiEnvBase::get_vthread_jvf
  • ec38505: 8323508: Remove TestGCLockerWithShenandoah.java line from TEST.groups
  • d2d58dd: 8322324: java/foreign/TestStubAllocFailure.java times out while waiting for forked process
  • b2a39c5: 8316241: Test jdk/jdk/jfr/jvm/TestChunkIntegrity.java failed
  • 679f526: 8322278: Generational ZGC: Adjust the comment of ZHeuristics::use_per_cpu_shared_small_pages
  • 2e472fe: 8322294: Cleanup NativePostCallNop
  • ... and 100 more: https://git.openjdk.org/jdk/compare/7eb25ec7b321abcd685bc761bd4c7cb110d52497...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 10, 2024

@viktorklang-ora Pushed as commit b86c3b7.

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

@viktorklang-ora
Copy link
Contributor Author

/backport jdk22u

@openjdk
Copy link

openjdk bot commented Feb 29, 2024

@viktorklang-ora the backport was successfully created on the branch backport-viktorklang-ora-b86c3b7a in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

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

The commit being backported was authored by Viktor Klang on 10 Jan 2024 and was reviewed by Jaikiran Pai, David Holmes and Alan Bateman.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22u:

$ git fetch https://github.com/openjdk-bots/jdk22u.git backport-viktorklang-ora-b86c3b7a:backport-viktorklang-ora-b86c3b7a
$ git checkout backport-viktorklang-ora-b86c3b7a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22u.git backport-viktorklang-ora-b86c3b7a

⚠️ @viktorklang-ora You are not yet a collaborator in my fork openjdk-bots/jdk22u. An invite will be sent out and you need to accept it before you can proceed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
4 participants