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 #46

Closed
wants to merge 1 commit into from

Conversation

kvergizova
Copy link

@kvergizova kvergizova commented May 7, 2021

I would like to backport JDK-8244500 to 15u as a prerequisite for JDK-8250984.
This is test-only fix, applies cleanly.
Tested with container tests, the affected tests passed.


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

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 46

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 7, 2021

👋 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 732d8865dfb56e2afbc13d7e53fb1017b9e8b10e 8244500: jtreg test error in test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java May 7, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 7, 2021

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

@openjdk
Copy link

@openjdk openjdk bot commented May 7, 2021

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

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 ready rfr labels May 7, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 8, 2021

Webrevs

@kvergizova
Copy link
Author

@kvergizova kvergizova commented May 11, 2021

/integrate

@openjdk openjdk bot closed this May 11, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels May 11, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 11, 2021

@kvergizova Since your change was applied there has been 1 commit pushed to the master branch:

  • ca0a09e: 8250627: Use -XX:+/-UseContainerSupport for enabling/disabling Java container metrics

Your commit was automatically rebased without conflicts.

Pushed as commit fb51322.

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

@kvergizova kvergizova deleted the backport-8244500 branch May 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated
1 participant