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

8287398: Allow concurrent execution of hotspot docker tests #8914

Conversation

iklam
Copy link
Member

@iklam iklam commented May 27, 2022

Remove the exclusiveAccess.dirs=. configuration (and thus the entire TEST.properties file) so that the test/hotspot/jtreg/containers/docker/*.java tests can be executed concurrently. This reduces total execution from about 8 minuets to about 2.5 minuets on my machine.

In early days of JDK support for docker, we disabled concurrent execution as a precaution to avoid collisions in docker operations, such as building an image. Such collisions should no longer happen (each image is uniquely named).

In comparison, in tests/jdk/jdk/internal/platform/docker there are no such limitations, and the 6 docker tests there can be executed in parallel without 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-8287398: Allow concurrent execution of hotspot docker tests

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8914/head:pull/8914
$ git checkout pull/8914

Update a local copy of the PR:
$ git checkout pull/8914
$ git pull https://git.openjdk.java.net/jdk pull/8914/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8914

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8914.diff

@bridgekeeper
Copy link

bridgekeeper bot commented May 27, 2022

👋 Welcome back iklam! 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 27, 2022

@iklam The following label will be automatically applied to this pull request:

  • hotspot-runtime

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 hotspot-runtime label May 27, 2022
@iklam iklam marked this pull request as ready for review May 27, 2022
@openjdk openjdk bot added the rfr label May 27, 2022
@mlbridge
Copy link

mlbridge bot commented May 27, 2022

Webrevs

Copy link
Contributor

@shipilev shipilev left a comment

Unfortunately, collisions still happen, see the uses of Common.imageName. I see at least two conflicts:

  • TestMemoryAwareness and TestMemoryWithCgroupV1
  • TestPids and TestPidsLimit

The first pair of tests nearly reliably fails on sufficiently large desktop after this patch. Please take a large machine and maybe test with make test TEST=containers/docker JTREG="REPEAT_COUNT=50"?

@iklam
Copy link
Member Author

iklam commented May 27, 2022

Unfortunately, collisions still happen, see the uses of Common.imageName. I see at least two conflicts:

  • TestMemoryAwareness and TestMemoryWithCgroupV1
  • TestPids and TestPidsLimit

The first pair of tests nearly reliably fails on sufficiently large desktop after this patch. Please take a large machine and maybe test with make test TEST=containers/docker JTREG="REPEAT_COUNT=50"?

I updated Common.imageName() to generate a unique name using the "test.name" system property. The suffix parameter isn't necessary anymore, but I left it there to avoid modifying all the test cases.

Copy link
Member

@mseledts mseledts left a comment

Looks good to me, thanks.

Copy link
Contributor

@shipilev shipilev left a comment

Okay, as long as multiple iterations of these tests pass.

@openjdk
Copy link

openjdk bot commented May 30, 2022

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

8287398: Allow concurrent execution of hotspot docker tests

Reviewed-by: shade, mseledtsov, sgehwolf

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

  • 73ba7fd: 8287157: Clean up G1Policy::next_gc_should_be_mixed()
  • b1b9674: 8287437: Temporarily disable Continuations::enabled() for platforms which don't have an implementation, yet
  • eb8d067: 8287433: [PPC64] g1_write_barrier_pre needs extension for Loom
  • d833173: 8286711: AArch64: serviceability agent tests fail with PAC enabled
  • 19fb8ab: 8287195: AArch64: Client VM build failure after JDK-8283689
  • 1b9987c: 8287288: Fix some typos in C1
  • 447ae00: 8287418: riscv: Fix correctness issue of MacroAssembler::movptr
  • a27ba1a: 8287363: null pointer should use NULL instead of 0
  • 744b822: 8287073: NPE from CgroupV2Subsystem.getInstance()
  • 5848a60: 8286093: java/awt/geom/Path2D/UnitTest.java failed with "RuntimeException: 2D bounds too small"
  • ... and 17 more: https://git.openjdk.java.net/jdk/compare/ec97da93c1d5bfcb80c19c15169f41926e59517b...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 label May 30, 2022
Copy link
Contributor

@jerboaa jerboaa left a comment

Seems fine.

@iklam
Copy link
Member Author

iklam commented Jun 1, 2022

Okay, as long as multiple iterations of these tests pass.

I tested with make test TEST=containers/docker JTREG="REPEAT_COUNT=50" on a machine with 32 threads and it passed after 157 minuets.

@iklam
Copy link
Member Author

iklam commented Jun 1, 2022

Thanks @mseledts @shipilev @jerboaa for the review.
/integrate

@openjdk
Copy link

openjdk bot commented Jun 1, 2022

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

  • 8071b23: 8287237: (fs) Files.probeContentType returns null if filename contains hash mark on Linux
  • 774928f: 8287625: ProblemList jdk/jshell/HighlightUITest.java on all platforms
  • e3791ec: 8287491: compiler/jvmci/errors/TestInvalidDebugInfo.java fails new assert: assert((uint)t < T_CONFLICT + 1) failed: invalid type #
  • f8eb7a8: 8287512: continuationEntry.hpp has incomplete definitions
  • b2b4ee2: 8287233: Crash in Continuation.enterSpecial: stop: tried to execute native method as non-native
  • 168b226: 8282662: Use List.of() factory method to reduce memory consumption
  • 48f19e4: 8287453: RenderPerfTest incorrectly measures performance
  • 0ef3d85: 8287552: riscv: Fix comment typo in li64
  • e0e15de: 8287366: Improve test failure reporting in GHA
  • 7846971: 8236569: -Xss not multiple of 4K does not work for the main thread on macOS
  • ... and 50 more: https://git.openjdk.java.net/jdk/compare/ec97da93c1d5bfcb80c19c15169f41926e59517b...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Jun 1, 2022
@openjdk openjdk bot closed this Jun 1, 2022
@openjdk openjdk bot removed ready rfr labels Jun 1, 2022
@openjdk
Copy link

openjdk bot commented Jun 1, 2022

@iklam Pushed as commit 67ecd30.

💡 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
hotspot-runtime integrated
5 participants