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

8323675: Race in jdk.javadoc-gendata #17402

Closed
wants to merge 2 commits into from

Conversation

magicus
Copy link
Member

@magicus magicus commented Jan 12, 2024

In JDK-8318913, the symbolgenerator started to look at current sources as well. This means that the gensrc stage needs to be completed before this is run. A dependency was added for jdk.compiler-gendata, but unfortunately the same tool is run also in jdk.javadoc-gendata, where no such safeguard was created.

The result is that the build can fail intermittently with:

.../module-info.java:77: error: module not found on module source path
module java.base {
^
error: cannot access module-info
  cannot resolve modules
Exception in thread "main" java.lang.AssertionError
at jdk.compiler.interim/com.sun.tools.javac.util.Assert.error(Assert.java:155)
at jdk.compiler.interim/com.sun.tools.javac.util.Assert.checkNonNull(Assert.java:62)
at jdk.compiler.interim/com.sun.tools.javac.comp.Modules.allModules(Modules.java:1225)
at jdk.compiler.interim/com.sun.tools.javac.comp.Modules.getObservableModule(Modules.java:1450)
at jdk.compiler.interim/com.sun.tools.javac.model.JavacElements.getModuleElement(JavacElements.java:144)
at jdk.compiler.interim/com.sun.tools.javac.model.JavacElements.getModuleElement(JavacElements.java:89)
at build.tools.symbolgenerator.JavadocElementList.main(JavadocElementList.java:98)
Compiling up to 2 files for BUILD_BREAKITERATOR_BASE
Compiling up to 2 files for BUILD_BREAKITERATOR_LD
make[3]: *** [.../_element_lists.marker] Error 1
Gendata.gmk:74: recipe for target '.../_element_lists.marker' failed

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17402

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 12, 2024

👋 Welcome back ihse! 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 bot commented Jan 12, 2024

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

  • build

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.

@openjdk openjdk bot added the build build-dev@openjdk.org label Jan 12, 2024
@magicus magicus marked this pull request as ready for review January 12, 2024 15:58
@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 12, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 12, 2024

Webrevs

make/Main.gmk Outdated Show resolved Hide resolved
@openjdk
Copy link

openjdk bot commented Jan 18, 2024

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

8323675: Race in jdk.javadoc-gendata

Reviewed-by: erikj, jlahoda

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

  • 8700de6: 8322744: VirtualThread.notifyJvmtiDisableSuspend should be static
  • 6c0bebc: 8159927: Add a test to verify JMOD files created in the images do not have debug symbols
  • 437342b: 8323556: CDS archive space addresses should be randomized with ArchiveRelocationMode=1
  • 39005e2: 8324041: ModuleOption.java failed with update release versioning scheme
  • 2865afe: 8323685: PrintSystemDictionaryAtExit has mutex rank assert
  • 6997bfc: 8323154: C2: assert(cmp != nullptr && cmp->Opcode() == Op_Cmp(bt)) failed: no exit test
  • 16be388: 8322383: G1: Only preserve marks on objects that are actually moved
  • 0081d8c: 8324147: Serial: Remove generation::compute_new_size
  • 5f71419: 8322366: Add IEEE rounding mode corruption check to JNI checks
  • 0533022: 8222719: libperfstat on AIX - cleanup old API versions
  • ... and 99 more: https://git.openjdk.org/jdk/compare/3e19bf88d5b51fe10c183f930b99bce961a368c1...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 Jan 18, 2024
Copy link
Contributor

@lahodaj lahodaj left a comment

Choose a reason for hiding this comment

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

With my very limited understanding of the targets, this look good to me. Thanks!

@magicus
Copy link
Member Author

magicus commented Jan 19, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Jan 19, 2024

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

  • f1b7335: 8320113: [macos14] : ShapeNotSetSometimes.java fails intermittently on macOS 14
  • 8700de6: 8322744: VirtualThread.notifyJvmtiDisableSuspend should be static
  • 6c0bebc: 8159927: Add a test to verify JMOD files created in the images do not have debug symbols
  • 437342b: 8323556: CDS archive space addresses should be randomized with ArchiveRelocationMode=1
  • 39005e2: 8324041: ModuleOption.java failed with update release versioning scheme
  • 2865afe: 8323685: PrintSystemDictionaryAtExit has mutex rank assert
  • 6997bfc: 8323154: C2: assert(cmp != nullptr && cmp->Opcode() == Op_Cmp(bt)) failed: no exit test
  • 16be388: 8322383: G1: Only preserve marks on objects that are actually moved
  • 0081d8c: 8324147: Serial: Remove generation::compute_new_size
  • 5f71419: 8322366: Add IEEE rounding mode corruption check to JNI checks
  • ... and 100 more: https://git.openjdk.org/jdk/compare/3e19bf88d5b51fe10c183f930b99bce961a368c1...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 19, 2024

@magicus Pushed as commit 9049402.

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

@magicus
Copy link
Member Author

magicus commented Jan 23, 2024

/backport jdk22

@magicus magicus deleted the javadoc-gendata-race branch January 23, 2024 15:19
@openjdk
Copy link

openjdk bot commented Jan 23, 2024

@magicus the backport was successfully created on the branch backport-magicus-9049402a in my personal fork of openjdk/jdk22. To create a pull request with this backport targeting openjdk/jdk22:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 9049402a from the openjdk/jdk repository.

The commit being backported was authored by Magnus Ihse Bursie on 19 Jan 2024 and was reviewed by Erik Joelsson and Jan Lahoda.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22:

$ git fetch https://github.com/openjdk-bots/jdk22.git backport-magicus-9049402a:backport-magicus-9049402a
$ git checkout backport-magicus-9049402a
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22.git backport-magicus-9049402a

⚠️ @magicus You are not yet a collaborator in my fork openjdk-bots/jdk22. An invite will be sent out and you need to accept it before you can proceed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants