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

8263248: IGV: accept graphs without node categories #2909

Closed
wants to merge 1 commit into from

Conversation

@robcasloz
Copy link
Contributor

@robcasloz robcasloz commented Mar 10, 2021

Currently, IGV fails if the input graphs do not contain node category information (added in JDK 17). This change replaces the failing assertion with a warning message in the log file, to support using the latest IGV on graphs generated before JDK 17.

Tested manually on graphs generated from JDK 11 and from JDK 17.


Progress

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

Issue

  • JDK-8263248: IGV: accept graphs without node categories

Reviewers

Download

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

If the input graph does not contain node category information, emit a warning
message and proceed loading the graph, instead of failing.
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Mar 10, 2021

👋 Welcome back rcastanedalo! 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 openjdk bot commented Mar 10, 2021

@robcasloz The following label will be automatically applied to this pull request:

  • hotspot-compiler

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

@robcasloz robcasloz marked this pull request as ready for review Mar 10, 2021
@openjdk openjdk bot added the rfr label Mar 10, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Mar 10, 2021

Webrevs

Copy link
Contributor

@neliasso neliasso left a comment

Looks good!

@openjdk
Copy link

@openjdk openjdk bot commented Mar 10, 2021

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

8263248: IGV: accept graphs without node categories

If the input graph does not contain node category information, emit a warning
message and proceed loading the graph, instead of failing.

Reviewed-by: neliasso, chagedorn, thartmann

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

  • 470b150: 8143041: Unify G1CollectorPolicy::PauseKind and G1YCType
  • f6b4ba0: 8261931: IGV: quick search fails on multi-line node labels
  • 7988c1d: 8262443: GenerateOopMap::do_interpretation can spin for a long time.
  • 32cbd19: 8263105: security-libs doclint cleanup
  • 6971c23: 8262351: Extra '0' in java.util.Formatter for '%012a' conversion with a sign character
  • c6d74bd: 8262910: Cleanup THREAD/TRAPS/naming and typing issues in ObjectMonitor and related code
  • 57f16f9: 8262377: Parallel class resolution loses constant pool error
  • b482733: 8259218: (fs) Add links in from overloaded methods in java.nio.file.Files
  • acda812: 8263333: Improve links from core reflection to JLS and JVMS
  • 9399e1b: 8261918: two runtime/cds/appcds/VerifierTest failed with "Unable to use shared archive"
  • ... and 22 more: https://git.openjdk.java.net/jdk/compare/3022baa953d2e9b9696bf2554467e6cc38de4234...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 label Mar 10, 2021
Copy link
Member

@chhagedorn chhagedorn left a comment

Looks good!

@robcasloz
Copy link
Contributor Author

@robcasloz robcasloz commented Mar 11, 2021

Thanks for reviewing, Nils and Christian!

Copy link
Member

@TobiHartmann TobiHartmann left a comment

Looks good to me too and fixes the error I was getting.

@robcasloz
Copy link
Contributor Author

@robcasloz robcasloz commented Mar 11, 2021

Looks good to me too and fixes the error I was getting.

Great, thanks for reviewing, Tobias!

@robcasloz
Copy link
Contributor Author

@robcasloz robcasloz commented Mar 11, 2021

/summary
If the input graph does not contain node category information, emit a warning
message and proceed loading the graph, instead of failing.

@openjdk
Copy link

@openjdk openjdk bot commented Mar 11, 2021

@robcasloz Setting summary to:

If the input graph does not contain node category information, emit a warning
message and proceed loading the graph, instead of failing.

@robcasloz
Copy link
Contributor Author

@robcasloz robcasloz commented Mar 11, 2021

/integrate

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

@openjdk openjdk bot commented Mar 11, 2021

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

  • a9b4f03: 8263069: Exclude some failing tests from security/infra/java/security/cert/CertPathValidator
  • 470b150: 8143041: Unify G1CollectorPolicy::PauseKind and G1YCType
  • f6b4ba0: 8261931: IGV: quick search fails on multi-line node labels
  • 7988c1d: 8262443: GenerateOopMap::do_interpretation can spin for a long time.
  • 32cbd19: 8263105: security-libs doclint cleanup
  • 6971c23: 8262351: Extra '0' in java.util.Formatter for '%012a' conversion with a sign character
  • c6d74bd: 8262910: Cleanup THREAD/TRAPS/naming and typing issues in ObjectMonitor and related code
  • 57f16f9: 8262377: Parallel class resolution loses constant pool error
  • b482733: 8259218: (fs) Add links in from overloaded methods in java.nio.file.Files
  • acda812: 8263333: Improve links from core reflection to JLS and JVMS
  • ... and 23 more: https://git.openjdk.java.net/jdk/compare/3022baa953d2e9b9696bf2554467e6cc38de4234...master

Your commit was automatically rebased without conflicts.

Pushed as commit 273f8bd.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants