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

8297742: Combine vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount tests #11400

Closed
wants to merge 3 commits into from

Conversation

alexmenkov
Copy link

@alexmenkov alexmenkov commented Nov 28, 2022

The fix combines almost the same tests to 1 test to remove code duplication


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-8297742: Combine vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount tests

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11400

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 28, 2022

👋 Welcome back amenkov! 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 added the rfr Pull request is ready for review label Nov 28, 2022
@openjdk
Copy link

openjdk bot commented Nov 28, 2022

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

  • hotspot
  • serviceability

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 serviceability serviceability-dev@openjdk.org hotspot hotspot-dev@openjdk.org labels Nov 28, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 28, 2022

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.

Looks good - nice consolidation. One nit with some pre-existing badly worded text.

Thanks.

@openjdk
Copy link

openjdk bot commented Nov 29, 2022

@alexmenkov 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:

8297742: Combine vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount tests

Reviewed-by: dholmes, lmesnik, kevinw, sspitsyn

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

  • b52611b: 8295401: Error recovery in module-info.java could be improved
  • 9e80cf9: 8296390: Incremental build failed with a NPE
  • b3501fd: 8297600: Check current thread in selected JRT_LEAF methods
  • f05bfb1: 8297515: serialVersionUID fields are not annotated with @serial
  • 22f5d01: 8252584: HotSpot Style Guide should permit alignas
  • 8ffed34: 8297681: Unnecessary color conversion during 4BYTE_ABGR_PRE to INT_ARGB_PRE blit
  • abe532a: 8296924: C2: assert(is_valid_AArch64_address(dest.target())) failed: bad address
  • 5dcaf6c: 8297749: Remove duplicate space in the ProtocolException message being thrown from HttpURLConnection
  • c7a679f: 8297290: Use int indices to reference CDS archived primitive mirrors
  • 37f613b: 8297676: DataBuffer.TYPE_SHORT/TYPE_FLOAT/TYPE_DOUBLE are not placeholders
  • ... and 111 more: https://git.openjdk.org/jdk/compare/5a45c25151b1da8e329ea2be21a0e4d2652f8b4a...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 ready Pull request is ready to be integrated label Nov 29, 2022
@kevinjwalls
Copy link
Contributor

looks good 8-)

Copy link
Contributor

@sspitsyn sspitsyn 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,
Serguei

@alexmenkov
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Nov 30, 2022

Going to push as commit 53dd214.
Since your change was applied there have been 132 commits pushed to the master branch:

  • 1323e98: 8297170: misc JCK tests fail with "FATAL ERROR in native method: JDWP Can't disable vthread end events, jvmtiError=JVMTI_ERROR_WRONG_PHASE(112)"
  • c685569: 8297731: Remove redundant check in MutableBigInteger.divide
  • dcf431d: 8287400: Make BitMap range parameter names consistent
  • a1f4db5: 8297584: G1 parallel phase event for scan heap roots is sent too often
  • be4245e: 8294924: JvmtiExport::post_exception_throw() doesn't deal well with concurrent stack processing
  • be99e84: 8296875: Generational ZGC: Refactor loom code
  • 301cf52: 8297284: ResolutionErrorTable's key is wrong
  • a97e7d9: 8297740: runtime/ClassUnload/UnloadTest.java failed with "Test failed: should still be live"
  • 4d730f5: 8297644: RISC-V: Compilation error when shenandoah is disabled
  • 27b339d: 8297523: Various GetPrimitiveArrayCritical miss result - NULL check
  • ... and 122 more: https://git.openjdk.org/jdk/compare/5a45c25151b1da8e329ea2be21a0e4d2652f8b4a...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 30, 2022

@alexmenkov Pushed as commit 53dd214.

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

@alexmenkov alexmenkov deleted the nsk_resetPeak branch November 30, 2022 18:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org
5 participants