8321183: Incorrect warning from cds about the modules file #16926

mkartashev · 2023-12-01T15:52:11Z

When the modules file used at run time differs in size from the one used at build time, the warning is confusing:

$ .../bin/java -jar .../demo/jfc/Notepad/Notepad.jar
[0.033s][warning][cds] A jar file is not the one used while building the shared archive file: /.../lib/modules
[0.033s][warning][cds] A jar file is not the one used while building the shared archive file: /.../lib/modules
[0.033s][warning][cds] /.../lib/modules timestamp has changed.

Notice that it is referred to as jar file and that timestamp has changed rather than size.

The suggested patch is pretty self-explanatory. With this patch, the warnings look like this:

./build/linux-x86_64-server-release/images/jdk/bin/java -jar ./build/linux-x86_64-server-release/images/jdk/demo/jfc/Notepad/Notepad.jar
[0.014s][warning][cds] This file is not the one used while building the shared archive file: /home/maxim/openjdk/jdk/build/linux-x86_64-server-release/images/jdk/lib/modules
[0.014s][warning][cds] This file is not the one used while building the shared archive file: /home/maxim/openjdk/jdk/build/linux-x86_64-server-release/images/jdk/lib/modules
[0.014s][warning][cds] /home/maxim/openjdk/jdk/build/linux-x86_64-server-release/images/jdk/lib/modules size has changed.

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-8321183: Incorrect warning from cds about the modules file (Bug - P4)

Reviewers

Calvin Cheung (@calvinccheung - Reviewer)
Ioi Lam (@iklam - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16926

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-12-01T15:54:02Z

👋 Welcome back mkartashev! 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 · 2023-12-01T15:54:49Z

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

hotspot-runtime

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.

mlbridge · 2023-12-01T15:57:22Z

Webrevs

01: Full - Incremental (135f12fb)
00: Full (baf21f80)

calvinccheung

If I understand the bug correct, is the original code at line 413 missing a condition?
if (_timestamp != st.st_mtime) {
should be
if (has_timestamp() && (_timestamp != st.st_mtime)) {

From your reproducing steps in the bug report:
"3. replace the .../lib/modules file in the first with the corresponding file from the second, making sure they differ in size"
After replacing the file, would the new file have a different timestamp?

Since you've changed the log statement from "A jar file..." to "This file...", the following tests under the appcds directory need to be adjusted:
WrongClasspath.java
dynamicArchive/MainModuleOnly.java
dynamicArchive/WrongTopClasspath.java
jigsaw/modulepath/MainModuleOnly.java

One suggestion below.

calvinccheung · 2023-12-01T22:18:52Z

src/hotspot/share/cds/filemap.cpp

+        if (time_differs) {
+          log_warning(cds)("%s timestamp has changed.", name);
+        } else {
+          log_warning(cds)("%s size has changed.", name);


Instead of else, maybe you can do the following because a file could differ both in timestamp and size.
if (time_differs) {
log_warning(cds)("%s timestamp has changed.", name);
}
if (size_differs) {
log_warning(cds)("%s size has changed.", name);
}

Very true, thanks!

mkartashev · 2023-12-04T08:17:08Z

@calvinccheung

I made the changes you suggested and ran test/hotspot/jtreg/runtime/cds. Please, have a look at the updated fix.

==============================
Test summary
==============================
   TEST                                              TOTAL  PASS  FAIL ERROR   
   jtreg:test/hotspot/jtreg/runtime/cds                292   292     0     0   
==============================
TEST SUCCESS

Finished building target 'run-test-only' in configuration 'linux-x86_64-server-release'

calvinccheung

Updates look good. Thanks.

openjdk · 2023-12-04T17:39:07Z

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

8321183: Incorrect warning from cds about the modules file

Reviewed-by: ccheung, iklam

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

aec3865: 8320697: RISC-V: Small refactoring for runtime calls
50d1839: 8318809: java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java shows intermittent failures on linux ppc64le and aarch64
81484d8: 8320687: sun.jvmstat.monitor.MonitoredHost.getMonitoredHost() throws unexpected exceptions when invoked concurrently
30b5d42: 8321069: JvmtiThreadState::state_for_while_locked() returns nullptr for an attached JNI thread with a java.lang.Thread object after JDK-8319935
bd04f91: 8321131: Console read line with zero out should zero out underlying buffer in JLine
155abc5: 8311906: Improve robustness of String constructors with mutable array inputs
316b783: 8321276: runtime/cds/appcds/dynamicArchive/DynamicSharedSymbols.java failed with "'17 2: jdk/test/lib/apps ' missing from stdout/stderr"
65be5e0: 8305931: jdk/jfr/jcmd/TestJcmdDumpPathToGCRoots.java failed with "Expected chains but found none"
f6be922: 8316193: jdk/jfr/event/oldobject/TestListenerLeak.java java.lang.Exception: Could not find leak
a9de5c7: 8315128: jdk/jfr/event/runtime/TestResidentSetSizeEvent.java fails with "The size should be less than or equal to peak"
... and 25 more: https://git.openjdk.org/jdk/compare/3087e14cde9257680f0406b11942f9cb7739cb7b...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@calvinccheung, @iklam) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

iklam

Looks good to me. Thanks for fixing this.

mkartashev · 2023-12-05T07:05:19Z

/integrate

openjdk · 2023-12-05T07:06:12Z

@mkartashev
Your change (at version 135f12f) is now ready to be sponsored by a Committer.

calvinccheung · 2023-12-05T17:15:12Z

/sponsor

openjdk · 2023-12-05T17:17:15Z

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

027b5db: 8321215: Incorrect x86 instruction encoding for VSIB addressing mode
61d0db3: 8318468: compiler/tiered/LevelTransitionTest.java fails with -XX:CompileThreshold=100 -XX:TieredStopAtLevel=1
87516e2: 8320943: Files/probeContentType/Basic.java fails on latest Windows 11 - content type mismatch
800f347: 8321216: SerialGC attempts to access the card table beyond the end of the heap during card table scan
a1fe16b: 8321300: Cleanup TestHFA
5b02188: 8321105: Enable UseCryptoPmullForCRC32 for Neoverse V2
4fbf22b: 8320652: ThreadInfo.isInNative needs to be updated to say what executing native code means
672f373: 8321163: [test] OutputAnalyzer.getExitValue() unnecessarily logs even when process has already completed
30817b7: 8317809: Insertion of free code blobs into code cache can be very slow during class unloading
a56286f: 8321269: Require platforms to define DEFAULT_CACHE_LINE_SIZE
... and 37 more: https://git.openjdk.org/jdk/compare/3087e14cde9257680f0406b11942f9cb7739cb7b...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-12-05T17:17:26Z

@calvinccheung @mkartashev Pushed as commit fd31f6a.

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

8321183: Incorrect warning from cds about the modules file

baf21f8

openjdk bot added the rfr Pull request is ready for review label Dec 1, 2023

openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Dec 1, 2023

calvinccheung suggested changes Dec 1, 2023

View reviewed changes

Corrected tests and the fix

135f12f

calvinccheung approved these changes Dec 4, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Dec 4, 2023

iklam approved these changes Dec 4, 2023

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 5, 2023

openjdk bot added the integrated Pull request has been integrated label Dec 5, 2023

openjdk bot closed this Dec 5, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 5, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8321183: Incorrect warning from cds about the modules file #16926

8321183: Incorrect warning from cds about the modules file #16926

Uh oh!

mkartashev commented Dec 1, 2023 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented Dec 1, 2023

Uh oh!

openjdk bot commented Dec 1, 2023

Uh oh!

mlbridge bot commented Dec 1, 2023 •

edited

Loading

Uh oh!

calvinccheung left a comment

Uh oh!

calvinccheung Dec 1, 2023

Uh oh!

mkartashev Dec 4, 2023

Uh oh!

mkartashev commented Dec 4, 2023

Uh oh!

calvinccheung left a comment

Uh oh!

openjdk bot commented Dec 4, 2023 •

edited

Loading

Uh oh!

iklam left a comment

Uh oh!

mkartashev commented Dec 5, 2023

Uh oh!

openjdk bot commented Dec 5, 2023

Uh oh!

calvinccheung commented Dec 5, 2023

Uh oh!

openjdk bot commented Dec 5, 2023

Uh oh!

openjdk bot commented Dec 5, 2023

Uh oh!

Uh oh!

8321183: Incorrect warning from cds about the modules file #16926

8321183: Incorrect warning from cds about the modules file #16926

Uh oh!

Conversation

mkartashev commented Dec 1, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Dec 1, 2023

Uh oh!

openjdk bot commented Dec 1, 2023

Uh oh!

mlbridge bot commented Dec 1, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

calvinccheung left a comment

Choose a reason for hiding this comment

Uh oh!

calvinccheung Dec 1, 2023

Choose a reason for hiding this comment

Uh oh!

mkartashev Dec 4, 2023

Choose a reason for hiding this comment

Uh oh!

mkartashev commented Dec 4, 2023

Uh oh!

calvinccheung left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Dec 4, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

iklam left a comment

Choose a reason for hiding this comment

Uh oh!

mkartashev commented Dec 5, 2023

Uh oh!

openjdk bot commented Dec 5, 2023

Uh oh!

calvinccheung commented Dec 5, 2023

Uh oh!

openjdk bot commented Dec 5, 2023

Uh oh!

openjdk bot commented Dec 5, 2023

Uh oh!

Uh oh!

mkartashev commented Dec 1, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Dec 1, 2023 •

edited

Loading

openjdk bot commented Dec 4, 2023 •

edited

Loading