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

8331142: Add test for number of loader threads in BasicDirectoryModel #725

Closed

Conversation

luchenlin
Copy link

@luchenlin luchenlin commented Jun 14, 2024

I backport this for parity with 21.0.5-oracle.
The test is limit to Windows, so backport with JDK-8331495 together.


Progress

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

Issues

  • JDK-8331142: Add test for number of loader threads in BasicDirectoryModel (Bug - P4 - Approved)
  • JDK-8331495: Limit BasicDirectoryModel/LoaderThreadCount.java to Windows only (Sub-task - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 725

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 14, 2024

👋 Welcome back andrewlu! 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 Jun 14, 2024

@luchenlin 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:

8331142: Add test for number of loader threads in BasicDirectoryModel
8331495: Limit BasicDirectoryModel/LoaderThreadCount.java to Windows only

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:

  • c08de56: 8332825: ubsan: guardedMemory.cpp:35:11: runtime error: null pointer passed as argument 2, which is declared to never be null
  • 762e983: 8317831: compiler/codecache/CheckLargePages.java fails on OL 8.8 with unexpected memory string
  • 8cb3b1f: 8269428: java/util/concurrent/ConcurrentHashMap/ToArray.java timed out
  • 710a0b0: 8327787: Convert javax/swing/border/Test4129681.java applet test to main
  • 28c16d4: 8331575: C2: crash when ConvL2I is split thru phi at LongCountedLoop
  • 8ca5280: 8322996: BoxLockNode creation fails with assert(reg < CHUNK_SIZE) failed: sanity
  • d2f857a: 8317299: safepoint scalarization doesn't keep track of the depth of the JVM state
  • 9a392ea: 8323972: C2 compilation fails with assert(!x->as_Loop()->is_loop_nest_inner_loop()) failed: loop was transformed
  • dba6716: 8321278: C2: Partial peeling fails with assert "last_peel <- first_not_peeled"
  • df03054: 8319793: C2 compilation fails with "Bad graph detected in build_loop_late" after JDK-8279888
  • ... and 1 more: https://git.openjdk.org/jdk21u-dev/compare/ccfae880577ab5b071815de13474e8987b45c943...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 changed the title Backport b2fb5ea13ba5087411410519213fc953ecc44618 8331142: Add test for number of loader threads in BasicDirectoryModel Jun 14, 2024
@openjdk
Copy link

openjdk bot commented Jun 14, 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 Jun 14, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 14, 2024

Webrevs

@luchenlin
Copy link
Author

/issue add JDK-8331495

@openjdk
Copy link

openjdk bot commented Jun 14, 2024

@luchenlin
Adding additional issue to issue list: 8331495: Limit BasicDirectoryModel/LoaderThreadCount.java to Windows only.

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. On additional hint: Using separate commits in a PR makes reviewing combined backports easier.

@openjdk
Copy link

openjdk bot commented Jun 15, 2024

⚠️ @luchenlin 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.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jun 17, 2024
@luchenlin
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 17, 2024

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

  • 686d69d: 8328115: Convert java/awt/font/TextLayout/TestJustification.html applet test to main
  • aeae521: 8327137: Add test for ConcurrentModificationException in BasicDirectoryModel
  • b0894f2: 8328011: Convert java/awt/Frame/GetBoundsResizeTest/GetBoundsResizeTest.java applet test to main
  • 7cf4272: 8327650: Test java/nio/channels/DatagramChannel/StressNativeSignal.java timed out
  • 71a035a: 8317635: Improve GetClassFields test to verify correctness of field order
  • a30e9c6: 8318071: IgnoreUnrecognizedVMOptions flag still causes failure in ArchiveHeapTestClass
  • a1e43d9: 8323274: C2: array load may float above range check
  • c08de56: 8332825: ubsan: guardedMemory.cpp:35:11: runtime error: null pointer passed as argument 2, which is declared to never be null
  • 762e983: 8317831: compiler/codecache/CheckLargePages.java fails on OL 8.8 with unexpected memory string
  • 8cb3b1f: 8269428: java/util/concurrent/ConcurrentHashMap/ToArray.java timed out
  • ... and 8 more: https://git.openjdk.org/jdk21u-dev/compare/ccfae880577ab5b071815de13474e8987b45c943...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 17, 2024

@luchenlin Pushed as commit fcd7fb7.

💡 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
2 participants