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

8291570: [TESTBUG] Part of JDK-8250984 absent from 11u #1289

Closed
wants to merge 1 commit into from

Conversation

gnu-andrew
Copy link
Member

@gnu-andrew gnu-andrew commented Jul 29, 2022

So, the story goes:

  • JDK-8250984 was backported in 11.0.10
  • JDK-8231111 was backported in 11.0.16
  • In later JDKs, these changes occur in the opposite order. So, when 8250984 was backported, changes related to 8231111 were stripped from it.
  • Now 8231111 has been backported, the testcase needs to be updated to recognise OSCONTAINER_ERROR (which is -2) as a valid return value from the CGroups v2 code.

Without this fix, we're seeing the testcase failing on newer systems. This change syncs the testcase with trunk.


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-8291570: [TESTBUG] Part of JDK-8250984 absent from 11u

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1289

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 29, 2022

👋 Welcome back andrew! 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 Jul 29, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 29, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Aug 3, 2022

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

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

8291570: [TESTBUG] Part of JDK-8250984 absent from 11u

Reviewed-by: serb, 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 65 new commits pushed to the master branch:

  • c9f3135: 8279385: [test] Adjust sun/security/pkcs12/KeytoolOpensslInteropTest.java after 8278344
  • 351508c: 8287663: Add a regression test for JDK-8287073
  • 0cd49f5: 8278344: sun/security/pkcs12/KeytoolOpensslInteropTest.java test fails because of different openssl output
  • 90a6418: 8287741: Fix of JDK-8287107 (unused cgv1 freezer controller) was incomplete
  • 1afd1f4: 8287073: NPE from CgroupV2Subsystem.getInstance()
  • 81c2958: 8287107: CgroupSubsystemFactory.setCgroupV2Path asserts with freezer controller
  • cbbec73: 8230708: Hotspot fails to build on linux-sparc with gcc-9
  • 01db476: 8282947: JFR: Dump on shutdown live-locks in some conditions
  • 1d7b292: 8238586: [TESTBUG] vmTestbase/jit/tiered/Test.java failed when TieredCompilation is disabled
  • 75e4cb3: 8292852: [11u] TestMemoryWithCgroupV1 fails after JDK-8292768
  • ... and 55 more: https://git.openjdk.org/jdk11u-dev/compare/3c330473b1dd57732b2d63377e8b742284b74fc1...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 Aug 3, 2022
@gnu-andrew
Copy link
Member Author

Thanks @mrserb
Added jdk11u-fix-request

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

LGTM

@gnu-andrew
Copy link
Member Author

I see jdk11u-fix-yes

@gnu-andrew
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Aug 31, 2022

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

  • 9186b3c: 8287463: JFR: Disable TestDevNull.java on Windows
  • c9f3135: 8279385: [test] Adjust sun/security/pkcs12/KeytoolOpensslInteropTest.java after 8278344
  • 351508c: 8287663: Add a regression test for JDK-8287073
  • 0cd49f5: 8278344: sun/security/pkcs12/KeytoolOpensslInteropTest.java test fails because of different openssl output
  • 90a6418: 8287741: Fix of JDK-8287107 (unused cgv1 freezer controller) was incomplete
  • 1afd1f4: 8287073: NPE from CgroupV2Subsystem.getInstance()
  • 81c2958: 8287107: CgroupSubsystemFactory.setCgroupV2Path asserts with freezer controller
  • cbbec73: 8230708: Hotspot fails to build on linux-sparc with gcc-9
  • 01db476: 8282947: JFR: Dump on shutdown live-locks in some conditions
  • 1d7b292: 8238586: [TESTBUG] vmTestbase/jit/tiered/Test.java failed when TieredCompilation is disabled
  • ... and 56 more: https://git.openjdk.org/jdk11u-dev/compare/3c330473b1dd57732b2d63377e8b742284b74fc1...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 31, 2022

@gnu-andrew Pushed as commit 2f0f34c.

💡 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
integrated Pull request has been integrated
3 participants