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

8260878: com/sun/jdi/JdbOptions.java fails without jfr #2346

Closed
wants to merge 1 commit into from

Conversation

DamonFool
Copy link
Member

@DamonFool DamonFool commented Feb 2, 2021

Hi all,

com/sun/jdi/JdbOptions.java fails in our ci/cd when jfr is disabled.
It would be better to fix it.

Thanks.
Best regards,
Jie


Progress

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

Issue

  • JDK-8260878: com/sun/jdi/JdbOptions.java fails without jfr

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/2346/head:pull/2346
$ git checkout pull/2346

@DamonFool
Copy link
Member Author

/issue add JDK-8260878
/test
/label add serviceability
/cc serviceability

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 2, 2021

👋 Welcome back jiefu! 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 Feb 2, 2021
@openjdk
Copy link

openjdk bot commented Feb 2, 2021

@DamonFool This issue is referenced in the PR title - it will now be updated.

@openjdk openjdk bot added the serviceability serviceability-dev@openjdk.org label Feb 2, 2021
@openjdk
Copy link

openjdk bot commented Feb 2, 2021

@DamonFool
The serviceability label was successfully added.

@openjdk
Copy link

openjdk bot commented Feb 2, 2021

@DamonFool The serviceability label was already applied.

@mlbridge
Copy link

mlbridge bot commented Feb 2, 2021

Webrevs

@@ -96,6 +96,7 @@ public static void main(String[] args) throws Exception {
// 'options' contains commas - values are quoted (double quotes)
test("-connect",
"com.sun.jdi.CommandLineLaunch:vmexec=java,options=\"-client\" \"-XX:+PrintVMOptions\""
+ " -XX:+IgnoreUnrecognizedVMOptions"
Copy link
Contributor

Choose a reason for hiding this comment

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

You need to be careful when using -xx:+IgnoreUnrecognizedVMOptions, because it can result in not detecting typos in the option names, which could happen with this test in the future if any other mods are made. Other options here are to skip this part of the test if JFR is not present, or better yet don't make the test rely on JFR. I don't think there is a reason that it needs to. It seems other options could have been used for the testing. Perhaps @alexmenkov can comment on why it was done this way.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks @plummercj for your review.

Let's wait for @alexmenkov 's comments.
Thanks.

Choose a reason for hiding this comment

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

Special handling for options with commas, quotes and single quotes was added many years ago for JFR (as it uses commas inside). The logic there is a bit tricky and I didn't want to brake existing functionality when I made some changes there, so I used "live" examples of JRF options in the test.
I don't know other VM options which use commas inside.

Choose a reason for hiding this comment

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

As the test verifies correct parsing of "options", I think it's ok to use IgnoreUnrecognizedVMOptions here

Copy link
Contributor

Choose a reason for hiding this comment

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

ok

@openjdk
Copy link

openjdk bot commented Feb 2, 2021

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

8260878: com/sun/jdi/JdbOptions.java fails without jfr

Reviewed-by: amenkov, cjplummer

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

  • 69189f8: 8256421: Add 2 HARICA roots to cacerts truststore
  • f546fd0: 8260902: CDS mapping errors should not lead to unconditional output
  • d7b1fc5: 8260707: java/lang/instrument/PremainClass/InheritAgent0100.java times out
  • 0093183: 8260368: [PPC64] GC interface needs enhancement to support GCs with load barriers
  • defcb04: 8260867: ProblemList java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java on linux
  • a421bfa: 8259839: SystemDictionary exports too much implementation
  • 189b65b: 8260264: Move common os_ inline methods to a common posix source file
  • 288a4fe: 8260643: Remove parallel version handling in CardTableRS::younger_refs_in_space_iterate()
  • ddd2951: 8260571: Add PrintMetaspaceStatistics to print metaspace statistics upon VM exit
  • fe407cf: 8260420: C2 compilation fails with assert(found_sfpt) failed: no node in loop that's not input to safepoint

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.

➡️ 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 Feb 2, 2021
@DamonFool
Copy link
Member Author

Thanks @alexmenkov and @plummercj .
/integrate

@openjdk openjdk bot closed this Feb 3, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 3, 2021
@openjdk
Copy link

openjdk bot commented Feb 3, 2021

@DamonFool Since your change was applied there have been 16 commits pushed to the master branch:

  • d423d36: 8258508: Merge G1RedirtyCardsQueue into qset
  • bec6043: 8259570: (macos) tools/jpackage tests fails with 'hdiutil: couldn't eject "disk2" - Resource busy'
  • ffbcf1b: 8260471: Change SystemDictionary::X_klass calls to vmClasses::X_klass
  • 9af3339: 8261003: Bad Copyright header format after JDK-8183372
  • 6dc3c6d: 8183372: Refactor java/lang/Class shell tests to java
  • 105d3e8: 8260861: TrustStoreDescriptor log the same value
  • 69189f8: 8256421: Add 2 HARICA roots to cacerts truststore
  • f546fd0: 8260902: CDS mapping errors should not lead to unconditional output
  • d7b1fc5: 8260707: java/lang/instrument/PremainClass/InheritAgent0100.java times out
  • 0093183: 8260368: [PPC64] GC interface needs enhancement to support GCs with load barriers
  • ... and 6 more: https://git.openjdk.java.net/jdk/compare/474dba2d8b93b5969a11635820b07c0ceff1836a...master

Your commit was automatically rebased without conflicts.

Pushed as commit a47befc.

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

@DamonFool DamonFool deleted the JDK-8260878 branch February 3, 2021 01:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated serviceability serviceability-dev@openjdk.org
3 participants