Skip to content

Conversation

@jaikiran
Copy link
Member

@jaikiran jaikiran commented Sep 10, 2024

Can I please get a review of this trivial change which replaces the usages of -mx and -ms to -Xmx and -Xms in tests and in one code comment?

As noted in https://bugs.openjdk.org/browse/JDK-8339834, these options are outdated and support for them will soon be deprecated and removed as part of https://bugs.openjdk.org/browse/JDK-8286851.

There are some more tests remaining in client-libs area which too require a similar change. I'll be creating a separate JBS issue and PR for that.


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-8339834: Replace usages of -mx and -ms in some tests (Sub-task - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/20930/head:pull/20930
$ git checkout pull/20930

Update a local copy of the PR:
$ git checkout pull/20930
$ git pull https://git.openjdk.org/jdk.git pull/20930/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 20930

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/20930.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 10, 2024

👋 Welcome back jpai! 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
Copy link

openjdk bot commented Sep 10, 2024

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

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

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

8339834: Replace usages of -mx and -ms in some tests

Reviewed-by: aivanov, ascarpino, prr, dholmes

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

  • bfe7f92: 8339741: RISC-V: C ABI breakage for integer on stack
  • 55a7cf1: 8322420: [Linux] cgroup v2: Limits in parent nested control groups are not detected
  • 5977888: 8339686: java/foreign/TestMappedHandshake.java fails with assert(depth < max_critical_stack_depth) failed: can't have more than 10 critical frames
  • 0b3f2e6: 8339242: Fix overflow issues in AdlArena
  • ceef161: 8339661: ZGC: Move some page resets and verification to callsites
  • 8fce527: 8339810: Clean up the code in sun.tools.jar.Main to properly close resources and use ZipFile during extract
  • a6faf82: 8339714: Delete tedious bool type define
  • 0764323: 8225049: Bad -Xlog example in -Xlog:help, online documentation, JEP
  • 9785e19: 8339638: Update vmTestbase/nsk/jvmti/FieldWatch tests to use virtual thread factory
  • 6fd043f: 8339789: Use index and definition tags in AnnotatedElement
  • ... and 16 more: https://git.openjdk.org/jdk/compare/56387a09810a3204ed820885e0ff0b26408be59d...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 10, 2024
@openjdk
Copy link

openjdk bot commented Sep 10, 2024

@jaikiran The following labels will be automatically applied to this pull request:

  • client
  • core-libs
  • nio
  • security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added security security-dev@openjdk.org nio nio-dev@openjdk.org client client-libs-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Sep 10, 2024
@mlbridge
Copy link

mlbridge bot commented Sep 10, 2024

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

LGTM!

Thanks for cleaning this up.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 10, 2024
Copy link
Member

@aivanov-jdk aivanov-jdk left a comment

Choose a reason for hiding this comment

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

Looks good to me.

It could be good to remove @author tags from all the modified tests.

* @test
* @bug 5102804
* @summary Tests memory leak
* @author Sergey Malenkov
Copy link
Member

Choose a reason for hiding this comment

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

Could you also remove the @author tag?

Copy link
Member Author

Choose a reason for hiding this comment

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

Done - I've now updated the PR to remove these author tags. Tests continue to pass.

* @test
* @bug 8027905
* @summary Tests that GC does not affect a property type
* @author Sergey Malenkov
Copy link
Member

Choose a reason for hiding this comment

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

Could you also remove the @author tag?

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Sep 11, 2024
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Sep 11, 2024
Copy link
Contributor

@ascarpino ascarpino left a comment

Choose a reason for hiding this comment

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

The Cache.java change, and the others, look good to me.

@jaikiran
Copy link
Member Author

Thank you everyone for the reviews.

@jaikiran
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Sep 12, 2024

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

  • c3711dc: 8339678: Update runtime/condy tests to be executed with VM flags
  • b0cff6b: 8299419: Thread.sleep(millis) may throw OOME
  • 591aa7c: 8335362: [Windows] Stack pointer increment in _cont_thaw stub can cause program to terminate with exit code 0xc0000005
  • 237a540: 8339801: Add better test failure diagnostics to vmTestbase/nsk/jdi/EventRequestManager/threadStartRequests/thrstartreq002
  • 35a94b7: 8339803: Acknowledge case insensitive unambiguous keywords in tzdata files
  • 51b85a1: 8339687: Rearrange reachabilityFence()s in jdk.test.lib.util.ForceGC
  • d9fdf69: 8333446: Add tests for hierarchical container support
  • bfe7f92: 8339741: RISC-V: C ABI breakage for integer on stack
  • 55a7cf1: 8322420: [Linux] cgroup v2: Limits in parent nested control groups are not detected
  • 5977888: 8339686: java/foreign/TestMappedHandshake.java fails with assert(depth < max_critical_stack_depth) failed: can't have more than 10 critical frames
  • ... and 23 more: https://git.openjdk.org/jdk/compare/56387a09810a3204ed820885e0ff0b26408be59d...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 12, 2024
@openjdk openjdk bot closed this Sep 12, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Sep 12, 2024
@openjdk
Copy link

openjdk bot commented Sep 12, 2024

@jaikiran Pushed as commit 1d39249.

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

@jaikiran jaikiran deleted the 8339834 branch September 12, 2024 02:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

client client-libs-dev@openjdk.org core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated nio nio-dev@openjdk.org security security-dev@openjdk.org

Development

Successfully merging this pull request may close these issues.

5 participants