8276787: Improve warning messages for -XX:+RecordDynamicDumpInfo #6383

iklam · 2021-11-15T07:50:13Z

[1] Fixed the error messages for the three scenarios described in the bug report. See the test SharedArchiveFileOption.java for new test cases for these messages.

[2] The global SharedDynamicArchivePath was used for both reading and writing the dynamic archive. Now the writing part is handled by DynamicArchiveBuilder::_archive_name. This simplifies the logic in Arguments::init_shared_archive_paths() and DynamicArchive::dump_for_jcmd(). It also makes the checks in [1] easier to implement.

Testing: running through Oracle CI tiers 1-4.

Progress

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

Issue

JDK-8276787: Improve warning messages for -XX:+RecordDynamicDumpInfo

Reviewers

Calvin Cheung (@calvinccheung - Reviewer) ⚠️ Review applies to 346c1d9
Thomas Stuefe (@tstuefe - Reviewer) ⚠️ Review applies to 346c1d9

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6383/head:pull/6383
$ git checkout pull/6383

Update a local copy of the PR:
$ git checkout pull/6383
$ git pull https://git.openjdk.java.net/jdk pull/6383/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6383

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6383.diff

bridgekeeper · 2021-11-15T07:50:59Z

👋 Welcome back iklam! 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 · 2021-11-15T07:53:35Z

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

hotspot

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.

iklam · 2021-11-15T08:01:20Z

/label remove hotspot
/label add hotspot-runtime

openjdk · 2021-11-15T08:01:54Z

@iklam
The hotspot label was successfully removed.

openjdk · 2021-11-15T08:03:00Z

@iklam
The hotspot-runtime label was successfully added.

mlbridge · 2021-11-15T08:08:56Z

Webrevs

calvinccheung · 2021-11-15T22:59:38Z

src/hotspot/share/runtime/arguments.cpp

  FileMapInfo::check_archive((const char*)cur_path, false /*is_static*/);
  *top_archive_path = cur_path;
 }

-bool Arguments::init_shared_archive_paths() {
+void Arguments::init_shared_archive_paths() {
  if (ArchiveClassesAtExit != NULL) {


Maybe change NULL to nullptr since your new code below in the same function uses nullptr?

calvinccheung · 2021-11-15T22:59:44Z

src/hotspot/share/runtime/arguments.cpp

    check_unsupported_dumping_properties();
-    SharedDynamicArchivePath = os::strdup_check_oom(ArchiveClassesAtExit, mtArguments);


I think it is clearer to leave this assignment alone.
It works in your current patch because in line 3561, the ArchiveClassesAtExit is used instead of SharedDynamicArchivePath.

SharedDynamicArchivePath had two meanings before this PR:

the dynamic archive that will be mapped during VM start-up.

the dynamic archive that will be dumped.

This made the code complicated (E.g., the old version of DynamicArchive::dump() needed to call into Arguments::init_shared_archive_paths() to set it SharedDynamicArchivePath).

This PR removed the second meaning. That's why I removed line 3504. Now if ArchiveClassesAtExit is specified, SharedDynamicArchivePath will be NULL.

Thanks for your explanation. It makes sense.

calvinccheung · 2021-11-15T22:59:49Z

src/hotspot/share/runtime/arguments.cpp

  }
+
  if (SharedArchiveFile == NULL) {


Null to nullptr?

calvinccheung · 2021-11-15T22:59:58Z

test/hotspot/jtreg/runtime/cds/appcds/dynamicArchive/SharedArchiveFileOption.java

@@ -34,9 +34,10 @@
 * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. SharedArchiveFileOption
 */


Please add @bug in the header section.

calvinccheung

Looks good. Some minor comments in arguments.cpp and the testcase.

iklam · 2021-11-16T07:59:36Z

@tstuefe could you take a look?

tstuefe

Hi Ioi,

I am not an AppCDS expert, but to me, this looks good.

Thanks, Thomas

tstuefe · 2021-11-16T14:51:19Z

src/hotspot/share/cds/dynamicArchive.cpp

@@ -336,7 +338,8 @@ void DynamicArchiveBuilder::write_archive(char* serialized_data) {
 class VM_PopulateDynamicDumpSharedSpace: public VM_GC_Sync_Operation {
  DynamicArchiveBuilder builder;


nit, preexisting, but should members not be prefixed with _?

openjdk · 2021-11-16T15:04:30Z

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

8276787: Improve warning messages for -XX:+RecordDynamicDumpInfo

Reviewed-by: ccheung, stuefe

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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.

calvinccheung

The update looks good.

…ages

iklam · 2021-11-16T21:02:10Z

Thanks @calvinccheung and @tstuefe for the review.
/integrate

openjdk · 2021-11-16T21:03:47Z

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

8ed384c: 8276609: Document setting property jdk.serialFilter to an invalid value throws ExceptionInInitializerError
cddc6ce: 8275811: Incorrect instance to dispose
b0a463f: 8169468: NoResizeEventOnDMChangeTest.java fails because FS Window didn't receive all resizes!

Your commit was automatically rebased without conflicts.

openjdk · 2021-11-16T21:04:02Z

@iklam Pushed as commit a77d8dd.

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

8276787: Improve warning messages for -XX:+RecordDynamicDumpInfo

e009921

openjdk bot added the hotspot hotspot-dev@openjdk.org label Nov 15, 2021

openjdk bot removed the hotspot hotspot-dev@openjdk.org label Nov 15, 2021

fixed trailing whitespaces

9f959ed

openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Nov 15, 2021

iklam marked this pull request as ready for review November 15, 2021 08:03

openjdk bot added the rfr Pull request is ready for review label Nov 15, 2021

calvinccheung reviewed Nov 15, 2021

View reviewed changes

@calvinccheung comments

346c1d9

tstuefe approved these changes Nov 16, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 16, 2021

calvinccheung approved these changes Nov 16, 2021

View reviewed changes

ioilam added 2 commits November 16, 2021 10:21

@tstuefe review - small coding style fix

7b48ae4

Merge branch 'master' into 8276787-improve-RecordDynamicDumpInfo-mess…

5a4de26

…ages

openjdk bot closed this Nov 16, 2021

openjdk bot added the integrated Pull request has been integrated label Nov 16, 2021

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 16, 2021

8276787: Improve warning messages for -XX:+RecordDynamicDumpInfo #6383

8276787: Improve warning messages for -XX:+RecordDynamicDumpInfo #6383

iklam commented Nov 15, 2021 •

edited by openjdk bot

bridgekeeper bot commented Nov 15, 2021

openjdk bot commented Nov 15, 2021

iklam commented Nov 15, 2021

openjdk bot commented Nov 15, 2021

openjdk bot commented Nov 15, 2021

mlbridge bot commented Nov 15, 2021 •

edited

calvinccheung Nov 15, 2021

calvinccheung Nov 15, 2021

iklam Nov 15, 2021

calvinccheung Nov 16, 2021

calvinccheung Nov 15, 2021

calvinccheung Nov 15, 2021

calvinccheung left a comment

iklam commented Nov 16, 2021

tstuefe left a comment

tstuefe Nov 16, 2021

openjdk bot commented Nov 16, 2021 •

edited

calvinccheung left a comment

iklam commented Nov 16, 2021

openjdk bot commented Nov 16, 2021

openjdk bot commented Nov 16, 2021

		check_unsupported_dumping_properties();
		SharedDynamicArchivePath = os::strdup_check_oom(ArchiveClassesAtExit, mtArguments);

		@@ -34,9 +34,10 @@
		* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:. SharedArchiveFileOption
		*/

		@@ -336,7 +338,8 @@ void DynamicArchiveBuilder::write_archive(char* serialized_data) {
		class VM_PopulateDynamicDumpSharedSpace: public VM_GC_Sync_Operation {
		DynamicArchiveBuilder builder;

8276787: Improve warning messages for -XX:+RecordDynamicDumpInfo #6383

8276787: Improve warning messages for -XX:+RecordDynamicDumpInfo #6383

Conversation

iklam commented Nov 15, 2021 • edited by openjdk bot

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Nov 15, 2021

openjdk bot commented Nov 15, 2021

iklam commented Nov 15, 2021

openjdk bot commented Nov 15, 2021

openjdk bot commented Nov 15, 2021

mlbridge bot commented Nov 15, 2021 • edited

Webrevs

calvinccheung Nov 15, 2021

Choose a reason for hiding this comment

calvinccheung Nov 15, 2021

Choose a reason for hiding this comment

iklam Nov 15, 2021

Choose a reason for hiding this comment

calvinccheung Nov 16, 2021

Choose a reason for hiding this comment

calvinccheung Nov 15, 2021

Choose a reason for hiding this comment

calvinccheung Nov 15, 2021

Choose a reason for hiding this comment

calvinccheung left a comment

Choose a reason for hiding this comment

iklam commented Nov 16, 2021

tstuefe left a comment

Choose a reason for hiding this comment

tstuefe Nov 16, 2021

Choose a reason for hiding this comment

openjdk bot commented Nov 16, 2021 • edited

calvinccheung left a comment

Choose a reason for hiding this comment

iklam commented Nov 16, 2021

openjdk bot commented Nov 16, 2021

openjdk bot commented Nov 16, 2021

iklam commented Nov 15, 2021 •

edited by openjdk bot

mlbridge bot commented Nov 15, 2021 •

edited

openjdk bot commented Nov 16, 2021 •

edited