Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.

8250984: Memory Docker tests fail on some Linux kernels w/o cgroupv1 swap limit capabilities #48

Closed
wants to merge 1 commit into from

Conversation

kvergizova
Copy link
Contributor

@kvergizova kvergizova commented Dec 4, 2020

I'd like to backport 8250984 to 13u for parity with 11u.
The patch doesn't apply cleanly since 13u doesn't have cgroups v2 support (JDK-8231111), reapplied manually.
The following changes are made:

  • some changes are reapplied to different files where the functionality originally located before cgroups v2 support
    (CgroupV1MemorySubSystemController.java -> MemorySubsystem in cgroupv1/SubSystem.java, CgroupV1Subsystem.java -> cgroupv1/Metrics.java, MetricsTesterCgroupV1.java -> MetricsTester.java)
  • changes in tests TestMemoryAwareness.java and MetricsMemoryTester.java are adjusted due to different context
    (JDK-8231111 and different implementation of JDK-8226575 for 13u)
  • changes in ProblemLists and PlainRead.java are skipped, they are not applicable to 13u

Tested with tier1 and container tests.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8250984: Memory Docker tests fail on some Linux kernels w/o cgroupv1 swap limit capabilities

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk13u-dev pull/48/head:pull/48
$ git checkout pull/48

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 4, 2020

👋 Welcome back evergizova! 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 0187567704d79ecf394d4cb656d0ba4c886351f1 8250984: Memory Docker tests fail on some Linux kernels w/o cgroupv1 … Dec 4, 2020
@openjdk
Copy link

openjdk bot commented Dec 4, 2020

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 Dec 4, 2020
@mlbridge
Copy link

mlbridge bot commented Dec 4, 2020

Webrevs

@kvergizova kvergizova changed the title 8250984: Memory Docker tests fail on some Linux kernels w/o cgroupv1 … 8250984: Memory Docker tests fail on some Linux kernels w/o cgroupv1 swap limit capabilities Dec 4, 2020
@openjdk
Copy link

openjdk bot commented Dec 4, 2020

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

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

8250984: Memory Docker tests fail on some Linux kernels w/o cgroupv1 swap limit capabilities

Reviewed-by: yan

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.

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 (@yan-too) 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 Dec 4, 2020
@kvergizova
Copy link
Contributor Author

/integrate

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

openjdk bot commented Dec 4, 2020

@kvergizova
Your change (at version d6c3d09) is now ready to be sponsored by a Committer.

@yan-too
Copy link
Collaborator

yan-too commented Dec 4, 2020

/sponsor

@openjdk openjdk bot closed this Dec 4, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed sponsor Pull request is ready to be sponsored ready Pull request is ready to be integrated rfr Pull request is ready for review labels Dec 4, 2020
@openjdk
Copy link

openjdk bot commented Dec 4, 2020

@yan-too @kvergizova Pushed as commit a48eb78.

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

@kvergizova kvergizova deleted the backport-8250984 branch December 4, 2020 11:41
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport integrated Pull request has been integrated
2 participants