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

8244500: jtreg test error in test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java #920

Closed
wants to merge 1 commit into from

Conversation

ebaron
Copy link
Member

@ebaron ebaron commented Mar 18, 2022

Doesn't apply cleanly because of newer backport "JDK-8250984: Memory Docker tests fail on some Linux kernels w/o cgroupv1".

In test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java:


Progress

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

Issue

  • JDK-8244500: jtreg test error in test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/920/head:pull/920
$ git checkout pull/920

Update a local copy of the PR:
$ git checkout pull/920
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/920/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 920

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/920.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 18, 2022

👋 Welcome back ebaron! 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 fb5132254d834ba01a4b65ce64143843e83c674e 8244500: jtreg test error in test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java Mar 18, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Mar 18, 2022

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

@openjdk openjdk bot added backport rfr labels Mar 18, 2022
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 18, 2022

Webrevs

Copy link
Contributor

@jerboaa jerboaa left a comment

Looks fine. Once you integrate could you please mention on the backport bug that the hunk from TestMemoryAwareness.java got already backported with JDK-8250984? Thanks!

@openjdk
Copy link

@openjdk openjdk bot commented Mar 21, 2022

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

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

8244500: jtreg test error in test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java

When the kernel doesn't support swap limits, expect host values instead.

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

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 (@jerboaa) 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 label Mar 21, 2022
@ebaron
Copy link
Member Author

@ebaron ebaron commented Mar 21, 2022

Looks fine. Once you integrate could you please mention on the backport bug that the hunk from TestMemoryAwareness.java got already backported with JDK-8250984? Thanks!

Will do, thanks for the review!

@jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Mar 25, 2022

@ebaron This should be ready to integrate now. Please let me know if you need help with it.

@ebaron
Copy link
Member Author

@ebaron ebaron commented Mar 28, 2022

/integrate

@openjdk openjdk bot added the sponsor label Mar 28, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Mar 28, 2022

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

@jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Mar 28, 2022

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Mar 28, 2022

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Mar 28, 2022
@openjdk openjdk bot closed this Mar 28, 2022
@openjdk openjdk bot removed ready rfr sponsor labels Mar 28, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Mar 28, 2022

@jerboaa @ebaron Pushed as commit 2049fca.

💡 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
2 participants