8293540: [Metrics] Incorrectly detected resource limits with additional cgroup fs mounts #221

jmtd · 2023-01-03T12:32:05Z

This is a backport of 8293540 to jdk8u-dev for cgroups v2 support.

Unclean: new test (TestDockerBasic.java) needed adjustments for the 8u test library paths and available methods.

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-8293540: [Metrics] Incorrectly detected resource limits with additional cgroup fs mounts

Reviewers

Severin Gehwolf (@jerboaa - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 221

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

Using diff file

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

bridgekeeper · 2023-01-03T12:32:46Z

👋 Welcome back jdowland! A progress list of the required criteria for merging this PR into pr/220 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2023-01-03T12:34:14Z

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

mlbridge · 2023-01-03T12:39:46Z

Webrevs

jerboaa

One test related issue, looks good otherwise.

jerboaa · 2023-01-11T15:30:49Z

jdk/test/jdk/internal/platform/cgroup/TestCgroupSubsystemFactory.java

@@ -359,6 +364,13 @@ private void doMultipleCpusetMountsTest(Path info) throws IOException {
        CgroupInfo cpuSetInfo = res.getInfos().get("cpuset");
        assertEquals("/sys/fs/cgroup/cpuset", cpuSetInfo.getMountPoint());
        assertEquals("/", cpuSetInfo.getMountRoot());
+        // Ensure controllers at /sys/fs/cgroup will be used
+        String[] ctrlNames = new String[] { "memory", "cpu", "cpuacct", "blkio", "pids" };


The pids controller is not present in 8u (JDK-8266490). This results in a test failure (NPE). Please remove it.

@jmtd This would also need fixing --^ :)

The pids controller is not present in 8u (JDK-8266490). This results in a test failure (NPE). Please remove it.

Thanks for catching. Confirmed, removed, re-tested, pushed.

openjdk-notifier · 2023-01-19T14:39:47Z

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8293540-jdk8u-dev
git fetch https://git.openjdk.org/jdk8u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

openjdk · 2023-01-19T14:41:40Z

@jmtd this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8293540-jdk8u-dev
git fetch https://git.openjdk.org/jdk8u-dev master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

jerboaa · 2023-01-19T18:25:33Z

@jmtd Please rebase this onto master when you get a chance. Thanks!

…al cgroup fs mounts Backport-of: 6d83482a6b5f1898514fd450d8143dbfef57e362

jmtd · 2023-01-20T10:48:29Z

@jerboaa:

@jmtd Please rebase this onto master when you get a chance. Thanks!

Done :)

openjdk · 2023-01-20T10:49:24Z

@jmtd Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

jerboaa

Looks OK now. Thanks.

openjdk · 2023-01-23T14:08:19Z

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

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

8293540: [Metrics] Incorrectly detected resource limits with additional cgroup fs mounts

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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.

jmtd · 2023-01-24T10:39:55Z

/integrate

openjdk · 2023-01-24T10:41:12Z

Going to push as commit a5bd901.

openjdk · 2023-01-24T10:41:25Z

@jmtd Pushed as commit a5bd901.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

openjdk bot changed the title ~~Backport 6d83482a6b5f1898514fd450d8143dbfef57e362~~ 8293540: [Metrics] Incorrectly detected resource limits with additional cgroup fs mounts Jan 3, 2023

openjdk bot added backport rfr Pull request is ready for review labels Jan 3, 2023

jerboaa suggested changes Jan 16, 2023

View reviewed changes

openjdk-notifier bot changed the base branch from pr/220 to master January 19, 2023 14:39

openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Jan 19, 2023

jmtd added 2 commits January 20, 2023 10:47

8293540: [Metrics] Incorrectly detected resource limits with addition…

f8b41fc

…al cgroup fs mounts Backport-of: 6d83482a6b5f1898514fd450d8143dbfef57e362

Fix test for 8u: lib paths and buildJdkDockerImage method

4cdc74b

jmtd force-pushed the 8293540-jdk8u-dev branch from 2bc0fa3 to 4cdc74b Compare January 20, 2023 10:48

openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Jan 20, 2023

don't check pid controller in jdk8u-dev

9fd796c

jerboaa approved these changes Jan 23, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jan 23, 2023

openjdk bot added the integrated Pull request has been integrated label Jan 24, 2023

openjdk bot closed this Jan 24, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 24, 2023

8293540: [Metrics] Incorrectly detected resource limits with additional cgroup fs mounts #221

8293540: [Metrics] Incorrectly detected resource limits with additional cgroup fs mounts #221

jmtd commented Jan 3, 2023 •

edited by openjdk bot

bridgekeeper bot commented Jan 3, 2023

openjdk bot commented Jan 3, 2023

mlbridge bot commented Jan 3, 2023 •

edited

jerboaa left a comment

jerboaa Jan 11, 2023

jerboaa Jan 20, 2023

jmtd Jan 23, 2023

openjdk-notifier bot commented Jan 19, 2023

openjdk bot commented Jan 19, 2023

jerboaa commented Jan 19, 2023

jmtd commented Jan 20, 2023

openjdk bot commented Jan 20, 2023

jerboaa left a comment

openjdk bot commented Jan 23, 2023

jmtd commented Jan 24, 2023

openjdk bot commented Jan 24, 2023

openjdk bot commented Jan 24, 2023

8293540: [Metrics] Incorrectly detected resource limits with additional cgroup fs mounts #221

8293540: [Metrics] Incorrectly detected resource limits with additional cgroup fs mounts #221

Conversation

jmtd commented Jan 3, 2023 • edited by openjdk bot

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Jan 3, 2023

openjdk bot commented Jan 3, 2023

mlbridge bot commented Jan 3, 2023 • edited

Webrevs

jerboaa left a comment

Choose a reason for hiding this comment

jerboaa Jan 11, 2023

Choose a reason for hiding this comment

jerboaa Jan 20, 2023

Choose a reason for hiding this comment

jmtd Jan 23, 2023

Choose a reason for hiding this comment

openjdk-notifier bot commented Jan 19, 2023

openjdk bot commented Jan 19, 2023

jerboaa commented Jan 19, 2023

jmtd commented Jan 20, 2023

openjdk bot commented Jan 20, 2023

jerboaa left a comment

Choose a reason for hiding this comment

openjdk bot commented Jan 23, 2023

jmtd commented Jan 24, 2023

openjdk bot commented Jan 24, 2023

openjdk bot commented Jan 24, 2023

jmtd commented Jan 3, 2023 •

edited by openjdk bot

mlbridge bot commented Jan 3, 2023 •

edited