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

8236617: jtreg test containers/docker/TestMemoryAwareness.java fails after 8226575 #34

Closed
wants to merge 1 commit into from

Conversation

kvergizova
Copy link
Contributor

@kvergizova kvergizova commented Nov 26, 2020

I'd like to backport 8236617 to 13u as follow-up fix for 8226575 that is already included to 13u.
The patch doesn't apply cleanly due to the context difference in TestMemoryAwareness.java
(getTotalMemorySize() and getFreeMemorySize() methods are not added to OperatingSystemMXBean in 13u by 8226575), reapplied manually.
Tested with container tests, the affected test passed.


Progress

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

Issue

  • JDK-8236617: jtreg test containers/docker/TestMemoryAwareness.java fails after 8226575

Reviewers

Download

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 26, 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 44f7fe57a8e90f31875bb50cd55eaf4d57b1a6f6 8236617: jtreg test containers/docker/TestMemoryAwareness.java fails after 8226575 Nov 26, 2020
@openjdk
Copy link

openjdk bot commented Nov 26, 2020

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

@openjdk openjdk bot added backport rfr labels Nov 26, 2020
@mlbridge
Copy link

mlbridge bot commented Nov 26, 2020

Webrevs

@openjdk
Copy link

openjdk bot commented Nov 27, 2020

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

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

8236617: jtreg test containers/docker/TestMemoryAwareness.java fails after 8226575

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

  • c6f81a5: 8223940: Private key not supported by chosen signature algorithm
  • 80be64a: 8249183: JVM crash in "AwtFrame::WmSize" method
  • 5af784b: 8233954: UnsatisfiedLinkError or NoSuchAlgorithmException after removing sunec.dll

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 (@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 label Nov 27, 2020
@kvergizova
Copy link
Contributor Author

kvergizova commented Nov 27, 2020

/integrate

@openjdk openjdk bot added the sponsor label Nov 27, 2020
@openjdk
Copy link

openjdk bot commented Nov 27, 2020

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

@yan-too
Copy link
Collaborator

yan-too commented Nov 27, 2020

/sponsor

@openjdk openjdk bot closed this Nov 27, 2020
@openjdk openjdk bot added integrated and removed sponsor ready rfr labels Nov 27, 2020
@openjdk
Copy link

openjdk bot commented Nov 27, 2020

@yan-too @kvergizova Since your change was applied there have been 3 commits pushed to the master branch:

  • c6f81a5: 8223940: Private key not supported by chosen signature algorithm
  • 80be64a: 8249183: JVM crash in "AwtFrame::WmSize" method
  • 5af784b: 8233954: UnsatisfiedLinkError or NoSuchAlgorithmException after removing sunec.dll

Your commit was automatically rebased without conflicts.

Pushed as commit e91e43b.

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

@kvergizova kvergizova deleted the backport-8236617 branch Nov 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated
2 participants