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

8278951: containers/cgroup/PlainRead.java fails on Ubuntu 21.10 #155

Closed
wants to merge 2 commits into from

Conversation

jmtd
Copy link
Contributor

@jmtd jmtd commented Nov 4, 2022

This is a backport of 8278951 to jdk8u-dev as part of the cgroups v2 backport initiative.

Dependent PRs are in use.

It was clean (modulo path shuffles). The use of log_trace needed adjusting for jdk8u-dev.


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-8278951: containers/cgroup/PlainRead.java fails on Ubuntu 21.10

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 155

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 4, 2022

👋 Welcome back jdowland! A progress list of the required criteria for merging this PR into pr/136 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 35172cdaf38d83cd3ed57a5436bf985dde2d802b 8278951: containers/cgroup/PlainRead.java fails on Ubuntu 21.10 Nov 4, 2022
@openjdk
Copy link

openjdk bot commented Nov 4, 2022

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Nov 4, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 4, 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.

While this backport likely does no harm, PlainRead.java test mentioned in the bug got introduced with JDK-8197408, which is not in 8u. We should add that first before adding a "fix" for that test ;-) Note: we seem to have most of the changes of JDK-8197408 already in 8u.

@jmtd
Copy link
Contributor Author

jmtd commented Nov 8, 2022

I've started a backport of the pre-requisite 8197408 (https://github.com/jmtd/jdk8u-dev/tree/8197408-jdk8u-dev) but it's not quite finished. It should slot into this sequence between this PR and its current parent (8239559 / pr/136).

As a reminder to myself, once I raise the PR for 8197408 I should /add 8198833

@jmtd jmtd changed the base branch from pr/136 to pr/164 November 9, 2022 11:07
@jmtd
Copy link
Contributor Author

jmtd commented Nov 10, 2022

Same test behaviour as the parent PR: passes on cgroups v1, fails on v2.

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.

@openjdk-notifier
Copy link

@jmtd Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 9, 2022

@jmtd This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@jerboaa
Copy link
Contributor

jerboaa commented Dec 9, 2022

Keep open, please.

@openjdk
Copy link

openjdk bot commented Dec 12, 2022

@jmtd Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

@openjdk-notifier
Copy link

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 8278951-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
Copy link

openjdk bot commented Dec 13, 2022

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

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

8278951: containers/cgroup/PlainRead.java fails on Ubuntu 21.10

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 13, 2022
@jerboaa
Copy link
Contributor

jerboaa commented Dec 14, 2022

@jmtd This needs a rebase onto latest master, please. Thanks! We cannot merge as is.

Reviewed-by: sgehwolf
Backport-of: 35172cdaf38d83cd3ed57a5436bf985dde2d802b
@openjdk
Copy link

openjdk bot commented Dec 14, 2022

@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.

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. Feel free to integrate and then rebase #157. Thanks!

@jmtd
Copy link
Contributor Author

jmtd commented Dec 15, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Dec 15, 2022

Going to push as commit 5b01ebb.

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

openjdk bot commented Dec 15, 2022

@jmtd Pushed as commit 5b01ebb.

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