Skip to content

8293472: Incorrect container resource limit detection if manual cgroup fs mounts present#216

Closed
jmtd wants to merge 4 commits intoopenjdk:masterfrom
jmtd:8293472-jdk8u-dev
Closed

8293472: Incorrect container resource limit detection if manual cgroup fs mounts present#216
jmtd wants to merge 4 commits intoopenjdk:masterfrom
jmtd:8293472-jdk8u-dev

Conversation

@jmtd
Copy link
Contributor

@jmtd jmtd commented Dec 20, 2022

This is a backport of 8293472 to 8u for cgroups v2 support. Not clean: log_debug→tty->print_cr and Files.writeString → Files.write() needed, as well as adjustments for the lack of 8266490 (PID controller support) in 8u.


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-8293472: Incorrect container resource limit detection if manual cgroup fs mounts present

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 216

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 20, 2022

👋 Welcome back jdowland! 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 changed the title Backport 8f3bbe950fb5a3d9f6cae122209df01df0f342f0 8293472: Incorrect container resource limit detection if manual cgroup fs mounts present Dec 20, 2022
@openjdk
Copy link

openjdk bot commented Dec 20, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Dec 20, 2022
@mlbridge
Copy link

mlbridge bot commented Dec 20, 2022

Webrevs

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.

Mostly good. Some comments on test code. Thanks!

Comment on lines +423 to +424
test.testCgroupv1MultipleControllerMounts(wb, test.cgroupv1MntInfoDoublePids);
test.testCgroupv1MultipleControllerMounts(wb, test.cgroupv1MntInfoDoublePids2);
Copy link
Contributor

Choose a reason for hiding this comment

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

The PIDs patch is not in 8u, but I guess this does no harm. OK.

As Severin points out, this test is not useful (in its current form)
for 8u.
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.

Looks good to me now.

@openjdk
Copy link

openjdk bot commented Dec 23, 2022

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

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

8293472: Incorrect container resource limit detection if manual cgroup fs mounts present

Reviewed-by: 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 1 new commit pushed to the master branch:

  • b4a745d: 8284977: MetricsTesterCgroupV2.getLongValueEntryFromFile fails when named value doesn't exist

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 Dec 23, 2022
@jerboaa
Copy link
Contributor

jerboaa commented Jan 9, 2023

This bug has all approvals now, please integrate.

@jmtd
Copy link
Contributor Author

jmtd commented Jan 9, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Jan 9, 2023

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

  • 0f698da: 8299548: Fix hotspot/test/runtime/Metaspace/MaxMetaspaceSizeTest.java in 8u
  • 7ad517d: 8283277: ISO 4217 Amendment 171 Update
  • c5751e6: 8229182: [TESTBUG] runtime/containers/docker/TestMemoryAwareness.java test fails on SLES12
  • 47090d6: 8297996: [8u] generated images are broken due to renaming of MSVC runtime DLL's
  • b4a745d: 8284977: MetricsTesterCgroupV2.getLongValueEntryFromFile fails when named value doesn't exist

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 9, 2023

@jmtd Pushed as commit 65fcf61.

💡 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 Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants