Skip to content

Conversation

@jmtd
Copy link
Contributor

@jmtd jmtd commented Sep 26, 2022

This is a back port of 8240189: [TESTBUG] Some cgroup tests are failing after JDK-8231111
for jdk8u-dev as part of an effort to backport support for Cgroups V2.

The intention is for this PR to depend upon 8231111: 2Cgroups v2: Rework Metrics in java.base so as to recognize unified hierarchy, which in turn depends upon 8206456: [TESTBUG] docker jtreg tests fail on systems without cpuset.effective_cpus / cpuset.effective_mems, both of which are dependencies for this patch-set.

This backport is one commit on top of pr/121. It does not apply clean after path unshuffling: some of the patch contexts around MetricsMemoryTester.java, MetricsTesterCgroupV1.java and MetricsTesterCgroupV2.java differ due to changes made in pr/121 to adjust for jdk8u-dev support (replacing Arrays.compare with Arrays.equals)

I'll report back testing results to this PR, I have to untangle them a bit first.


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-8240189: [TESTBUG] Some cgroup tests are failing after JDK-8231111

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 124

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

Using diff file

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

@jmtd jmtd changed the base branch from master to pr/121 September 26, 2022 10:16
@bridgekeeper
Copy link

bridgekeeper bot commented Sep 26, 2022

👋 Welcome back jdowland! A progress list of the required criteria for merging this PR into pr/121 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 c92adf41587767e9c5c8e116cfaeb375d36928aa 8240189: [TESTBUG] Some cgroup tests are failing after JDK-8231111 Sep 26, 2022
@openjdk
Copy link

openjdk bot commented Sep 26, 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 Sep 26, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 26, 2022

Webrevs

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 24, 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!

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

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!

@jmtd
Copy link
Contributor Author

jmtd commented Dec 11, 2022

wake up

@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 8240189-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 12, 2022

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

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

8240189: [TESTBUG] Some cgroup tests are failing after JDK-8231111

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 12, 2022
Reviewed-by: mdoerr
Backport-of: c92adf41587767e9c5c8e116cfaeb375d36928aa
@jmtd jmtd force-pushed the 8240189-jdk8u-dev branch from f560099 to 3a1fa20 Compare December 13, 2022 09:03
@openjdk
Copy link

openjdk bot commented Dec 13, 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.

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.

Still good. Feel free to integrate and move on to rebase #136 :)

@jmtd
Copy link
Contributor Author

jmtd commented Dec 13, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Dec 13, 2022

Going to push as commit 9cd39a4.

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

openjdk bot commented Dec 13, 2022

@jmtd Pushed as commit 9cd39a4.

💡 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