Skip to content

8229182: [TESTBUG] runtime/containers/docker/TestMemoryAwareness.java test fails on SLES12 #186

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

Closed
wants to merge 2 commits into from

Conversation

lutkerd
Copy link
Contributor

@lutkerd lutkerd commented Nov 18, 2022

Backporting JDK-8229182, did not apply cleanly and had to be manually fixed up.


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-8229182: [TESTBUG] runtime/containers/docker/TestMemoryAwareness.java test fails on SLES12

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 186

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 18, 2022

👋 Welcome back lutkerd! 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 a41b9a71acdf69b78104677a1ca899ff36293a60 8229182: [TESTBUG] runtime/containers/docker/TestMemoryAwareness.java test fails on SLES12 Nov 18, 2022
@openjdk
Copy link

openjdk bot commented Nov 18, 2022

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

@openjdk openjdk bot added the backport label Nov 18, 2022
@lutkerd lutkerd marked this pull request as ready for review November 18, 2022 23:56
@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 18, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 19, 2022

Webrevs

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

The copyright line in TestMemoryAwareness and DockerRunOptions.java should be

  • Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.

Otherwise, lgtm.

@lutkerd
Copy link
Contributor Author

lutkerd commented Nov 22, 2022

The copyright line in TestMemoryAwareness and DockerRunOptions.java should be

* Copyright (c) 2017, 2019, Oracle and/or its affiliates. All rights reserved.

Thanks, fixed!

Copy link
Member

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

@lutkerd 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
Copy link

openjdk bot commented Nov 22, 2022

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

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

8229182: [TESTBUG] runtime/containers/docker/TestMemoryAwareness.java test fails on SLES12

Reviewed-by: phh

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 54 new commits pushed to the master branch:

  • 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
  • b4ef3d3: 8292083: Detected container memory limit may exceed physical machine memory
  • 78cdc41: 8234484: Add ability to configure third port for remote JMX
  • 06546d7: 8284102: [TESTBUG] [11u] Retroactively add regression test for JDK-8272124
  • 9f76da9: 8284756: [11u] Remove unused isUseContainerSupport in CgroupV1Subsystem
  • d6101df: 8254717: isAssignableFrom checks in KeyFactorySpi.engineGetKeySpec appear to be backwards
  • 99ff02e: 8266391: Replace use of reflection in jdk.internal.platform.Metrics
  • 0662db2: 8252957: Wrong comment in CgroupV1Subsystem::cpu_quota
  • d039c8d: 8291570: [TESTBUG] Part of JDK-8250984 absent from 11u
  • ... and 44 more: https://git.openjdk.org/jdk8u-dev/compare/5a32484f0f3be91ccaef76271361ef2fbfdf7558...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

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

jerboaa commented Nov 23, 2022

This seems fine, but could this wait until after 8u-dev forks to 8u372 (probably next week) and we integrate the cg v2 backports as this conflicts with the patch set?

Note, the work-around seems to be to add cgroup_enable=memory swapaccount=1 to the kernel command line on the test host.

@lutkerd
Copy link
Contributor Author

lutkerd commented Nov 28, 2022

Sure, we can wait.

@jerboaa
Copy link
Contributor

jerboaa commented Nov 28, 2022

Thanks!

@jerboaa
Copy link
Contributor

jerboaa commented Dec 19, 2022

@lutkerd Feel free to go ahead and integrate. Thanks!

@lutkerd
Copy link
Contributor Author

lutkerd commented Dec 27, 2022

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 27, 2022
@openjdk
Copy link

openjdk bot commented Dec 27, 2022

@lutkerd
Your change (at version 3c86d09) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 27, 2022

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

  • 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
  • b4ef3d3: 8292083: Detected container memory limit may exceed physical machine memory
  • 78cdc41: 8234484: Add ability to configure third port for remote JMX
  • 06546d7: 8284102: [TESTBUG] [11u] Retroactively add regression test for JDK-8272124
  • 9f76da9: 8284756: [11u] Remove unused isUseContainerSupport in CgroupV1Subsystem
  • d6101df: 8254717: isAssignableFrom checks in KeyFactorySpi.engineGetKeySpec appear to be backwards
  • 99ff02e: 8266391: Replace use of reflection in jdk.internal.platform.Metrics
  • 0662db2: 8252957: Wrong comment in CgroupV1Subsystem::cpu_quota
  • d039c8d: 8291570: [TESTBUG] Part of JDK-8250984 absent from 11u
  • ... and 44 more: https://git.openjdk.org/jdk8u-dev/compare/5a32484f0f3be91ccaef76271361ef2fbfdf7558...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 27, 2022

@phohensee @lutkerd Pushed as commit c5751e6.

💡 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
Development

Successfully merging this pull request may close these issues.

3 participants