Navigation Menu

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

8287663 Add a regression test for JDK-8287073 #8993

Closed

Conversation

jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Jun 2, 2022

This adds a regression test for a recent fix (JDK-8287073). I've restructured the linux specific JDK code to call a separate static function to enable this test. It'll help future tests too.

Testing:

  • Container tests continue to pass + GHA
  • New regression test fails prior the code fix of JDK-8287073 and passes with it

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8993

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 2, 2022

👋 Welcome back sgehwolf! 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.

@jerboaa
Copy link
Contributor Author

jerboaa commented Jun 2, 2022

/cc @mkartashev

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 2, 2022
@openjdk
Copy link

openjdk bot commented Jun 2, 2022

@jerboaa
The label @mkartashev is not a valid label.
These labels are valid:

  • serviceability
  • hotspot
  • hotspot-compiler
  • ide-support
  • kulla
  • i18n
  • shenandoah
  • jdk
  • javadoc
  • security
  • hotspot-runtime
  • jmx
  • build
  • nio
  • client
  • core-libs
  • compiler
  • net
  • hotspot-gc
  • hotspot-jfr

@openjdk
Copy link

openjdk bot commented Jun 2, 2022

@jerboaa The following labels will be automatically applied to this pull request:

  • core-libs
  • serviceability

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

@openjdk openjdk bot added serviceability serviceability-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Jun 2, 2022
@mlbridge
Copy link

mlbridge bot commented Jun 2, 2022

Webrevs

@mkartashev
Copy link
Member

@jerboaa Thanks for taking care of the test! I'm not a reviewer, but FWIW the test looks good to me.

Copy link
Member

@iklam iklam 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 Jun 6, 2022

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

8287663: Add a regression test for JDK-8287073

Reviewed-by: iklam

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

  • a50b06e: 8287867: Bad merge of jdk/test/lib/util/ForceGC.java causing test compilation error
  • c37c8e5: 8250950: Allow per-user and system wide configuration of a jpackaged app
  • 124ba45: 8287101: CDS should check for file truncation for all regions
  • 0e06bf3: 8287838: Update Float and Double to use snippets
  • a277590: 8287761: Make the logging of J2DBench stable
  • 5264881: 8286481: Exception printed to stdout on Windows when storing transparent image in clipboard
  • e94b05c: 8285285: Avoid redundant allocations in WindowsPreferences
  • 3eb49fe: 8287766: Unnecessary Vector usage in LdapClient
  • 2e332c2: 8287671: Adjust ForceGC to invoke System::gc fewer times for negative case
  • c328f8f: 8287764: runtime/cds/serviceability/ReplaceCriticalClasses failed on localized Windows
  • ... and 95 more: https://git.openjdk.java.net/jdk/compare/73ba7fdce838ba8a2c227a972c176311e6cc0b41...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 Jun 6, 2022
@iklam
Copy link
Member

iklam commented Jun 6, 2022

Not specific to this PR, but we have a general problem with lots of duplication between these two files. E.g.,

private String mntInfoHybridStub =
"30 23 0:26 / /sys/fs/cgroup ro,nosuid,nodev,noexec shared:4 - tmpfs tmpfs ro,seclabel,mode=755\n" +
"32 30 0:28 / /sys/fs/cgroup/systemd rw,nosuid,nodev,noexec,relatime shared:6 - cgroup none rw,seclabel,xattr,name=systemd\n" +
"36 30 0:32 / /sys/fs/cgroup/pids rw,nosuid,nodev,noexec,relatime shared:8 - cgroup none rw,seclabel,pids\n" +
"37 30 0:33 / /sys/fs/cgroup/perf_event rw,nosuid,nodev,noexec,relatime shared:9 - cgroup none rw,seclabel,perf_event\n" +
"38 30 0:34 / /sys/fs/cgroup/net_cls,net_prio rw,nosuid,nodev,noexec,relatime shared:10 - cgroup none rw,seclabel,net_cls,net_prio\n" +
"39 30 0:35 / /sys/fs/cgroup/hugetlb rw,nosuid,nodev,noexec,relatime shared:11 - cgroup none rw,seclabel,hugetlb\n" +
"40 30 0:36 / /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:12 - cgroup none rw,seclabel,cpu,cpuacct\n" +
"41 30 0:37 / /sys/fs/cgroup/devices rw,nosuid,nodev,noexec,relatime shared:13 - cgroup none rw,seclabel,devices\n" +
"42 30 0:38 / /sys/fs/cgroup/cpuset rw,nosuid,nodev,noexec,relatime shared:14 - cgroup none rw,seclabel,cpuset\n" +
"43 30 0:39 / /sys/fs/cgroup/blkio rw,nosuid,nodev,noexec,relatime shared:15 - cgroup none rw,seclabel,blkio\n" +
"44 30 0:40 / /sys/fs/cgroup/freezer rw,nosuid,nodev,noexec,relatime shared:16 - cgroup none rw,seclabel,freezer\n";

private String mntInfoHybrid =
"30 23 0:26 / /sys/fs/cgroup ro,nosuid,nodev,noexec shared:4 - tmpfs tmpfs ro,seclabel,mode=755\n" +
"31 30 0:27 / /sys/fs/cgroup/unified rw,nosuid,nodev,noexec,relatime shared:5 - cgroup2 none rw,seclabel,nsdelegate\n" +
"32 30 0:28 / /sys/fs/cgroup/systemd rw,nosuid,nodev,noexec,relatime shared:6 - cgroup none rw,seclabel,xattr,name=systemd\n" +
"35 30 0:31 / /sys/fs/cgroup/memory rw,nosuid,nodev,noexec,relatime shared:7 - cgroup none rw,seclabel,memory\n" +
"36 30 0:32 / /sys/fs/cgroup/pids rw,nosuid,nodev,noexec,relatime shared:8 - cgroup none rw,seclabel,pids\n" +
"37 30 0:33 / /sys/fs/cgroup/perf_event rw,nosuid,nodev,noexec,relatime shared:9 - cgroup none rw,seclabel,perf_event\n" +
"38 30 0:34 / /sys/fs/cgroup/net_cls,net_prio rw,nosuid,nodev,noexec,relatime shared:10 - cgroup none rw,seclabel,net_cls,net_prio\n" +
"39 30 0:35 / /sys/fs/cgroup/hugetlb rw,nosuid,nodev,noexec,relatime shared:11 - cgroup none rw,seclabel,hugetlb\n" +
"40 30 0:36 / /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:12 - cgroup none rw,seclabel,cpu,cpuacct\n" +
"41 30 0:37 / /sys/fs/cgroup/devices rw,nosuid,nodev,noexec,relatime shared:13 - cgroup none rw,seclabel,devices\n" +
"42 30 0:38 / /sys/fs/cgroup/cpuset rw,nosuid,nodev,noexec,relatime shared:14 - cgroup none rw,seclabel,cpuset\n" +
"43 30 0:39 / /sys/fs/cgroup/blkio rw,nosuid,nodev,noexec,relatime shared:15 - cgroup none rw,seclabel,blkio\n" +
"44 30 0:40 / /sys/fs/cgroup/freezer rw,nosuid,nodev,noexec,relatime shared:16 - cgroup none rw,seclabel,freezer\n";

We should try to consolidate these test cases to improve maintainability.

@iklam
Copy link
Member

iklam commented Jun 7, 2022

We should try to consolidate these test cases to improve maintainability.

I filed JDK-8287185

@jerboaa
Copy link
Contributor Author

jerboaa commented Jun 7, 2022

/integrate

@jerboaa
Copy link
Contributor Author

jerboaa commented Jun 7, 2022

We should try to consolidate these test cases to improve maintainability.

I filed JDK-8287185

Agreed. Thanks for the review @iklam

@openjdk
Copy link

openjdk bot commented Jun 7, 2022

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

  • b647a12: 8286940: [IR Framework] Allow IR tests to build and use Whitebox without -DSkipWhiteBoxInstall=true
  • dbf0905: 8286967: Unproblemlist compiler/c2/irTests/TestSkeletonPredicates.java and add additional test for JDK-8286638
  • 39fa52b: 8283667: [vectorapi] Vectorization for masked load with IOOBE with predicate feature
  • 42261d7: 8287785: Reduce runtime of java.lang.invoke microbenchmarks
  • b6c6cc5: 8286360: ARM32: Fix crashes after JDK-8284161 (Virtual Threads)
  • 778ed1a: 8287810: Reduce runtime of java.lang microbenchmarks
  • aa6c568: 8287798: Reduce runtime of java.lang.reflect/runtime microbenchmarks
  • 956d44d: 8287071: Loom: Cleanup x86_64 gen_continuation_enter
  • f6a79e3: 8287674: CSS improvements for summary lists
  • ef7cc21: 8286279: [vectorapi] Only check index of masked lanes if offset is out of array boundary for masked store
  • ... and 106 more: https://git.openjdk.java.net/jdk/compare/73ba7fdce838ba8a2c227a972c176311e6cc0b41...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 7, 2022

@jerboaa Pushed as commit 2d8c649.

💡 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
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org
3 participants