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

8318082: ConcurrentModificationException from IndexWriter #23

Closed
wants to merge 2 commits into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Dec 13, 2023

Unclean backport to fix a customer-visible bug in Javadoc tool. The uncleanliness comes from the missing refactoring (JDK-8309566, that looks unnecessary to backport.

Maybe @jonathan-gibbons and @pavelrappo want to take a look.

Additional testing:

  • New test fails without the product fix, passes with it
  • jdk/javadoc still passes

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
  • JDK-8318082 needs maintainer approval

Issue

  • JDK-8318082: ConcurrentModificationException from IndexWriter (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/23/head:pull/23
$ git checkout pull/23

Update a local copy of the PR:
$ git checkout pull/23
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/23/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/23.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 13, 2023

👋 Welcome back shade! 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 changed the title Backport fc29a2e152310ed81bd1bb23e6f17d02f055a454 8318082: ConcurrentModificationException from IndexWriter Dec 13, 2023
@openjdk
Copy link

openjdk bot commented Dec 13, 2023

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Dec 13, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 13, 2023

Webrevs

Copy link
Member

@pavelrappo pavelrappo left a comment

Choose a reason for hiding this comment

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

Output from git range-diff pull/23^! fc29a2e^! and this backport look fine.

@shipilev
Copy link
Member Author

shipilev commented Jan 4, 2024

Still looking for formal (R)eviewers here, then I could apply for maintainer approval.

@shipilev
Copy link
Member Author

shipilev commented Jan 8, 2024

@phohensee, @jerboaa, maybe?

Copy link
Member

@simonis simonis left a comment

Choose a reason for hiding this comment

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

Looks good.

@openjdk
Copy link

openjdk bot commented Jan 8, 2024

⚠️ @shipilev This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@shipilev
Copy link
Member Author

shipilev commented Jan 8, 2024

/approval request Unclean backport to fix a customer-visible bug in Javadoc tool. There are contextual differences that prevent it from being clean. 21u PR acked by Jonathan, Pavel, and Volker.

@openjdk
Copy link

openjdk bot commented Jan 8, 2024

@shipilev
8318082: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Jan 8, 2024
@openjdk
Copy link

openjdk bot commented Jan 8, 2024

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

8318082: ConcurrentModificationException from IndexWriter

Reviewed-by: prappo, simonis

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

  • b745bb5: 8319883: Zero: Use atomic built-ins for 64-bit accesses
  • a85f3f8: 8320145: Compiler should accept final variable in Record Pattern
  • 1e66488: 8321599: Data loss in AVX3 Base64 decoding
  • d4797b7: 8316693: Simplify at-requires checkDockerSupport()
  • dfc9324: 8319879: Stress mode to randomize incremental inlining decision
  • 307569f: 8319938: TestFileChooserSingleDirectorySelection.java fails with "getSelectedFiles returned empty array"
  • db1fa92: 8316594: C2 SuperWord: wrong result with hand unrolled loops
  • c8caefa: 8311279: TestStressIGVNAndCCP.java failed with different IGVN traces for the same seed
  • e8aa37d: 8310238: [test bug] javax/swing/JTableHeader/6889007/bug6889007.java fails
  • 854c319: 8319569: Several java/util tests should be updated to accept VM flags
  • ... and 10 more: https://git.openjdk.org/jdk21u-dev/compare/966071a5f10a7a8910b2639e10c961924a07d675...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 ready Pull request is ready to be integrated and removed approval labels Jan 8, 2024
@shipilev
Copy link
Member Author

shipilev commented Jan 9, 2024

Thanks all!

/integrate

@openjdk
Copy link

openjdk bot commented Jan 9, 2024

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

  • b745bb5: 8319883: Zero: Use atomic built-ins for 64-bit accesses
  • a85f3f8: 8320145: Compiler should accept final variable in Record Pattern
  • 1e66488: 8321599: Data loss in AVX3 Base64 decoding
  • d4797b7: 8316693: Simplify at-requires checkDockerSupport()
  • dfc9324: 8319879: Stress mode to randomize incremental inlining decision
  • 307569f: 8319938: TestFileChooserSingleDirectorySelection.java fails with "getSelectedFiles returned empty array"
  • db1fa92: 8316594: C2 SuperWord: wrong result with hand unrolled loops
  • c8caefa: 8311279: TestStressIGVNAndCCP.java failed with different IGVN traces for the same seed
  • e8aa37d: 8310238: [test bug] javax/swing/JTableHeader/6889007/bug6889007.java fails
  • 854c319: 8319569: Several java/util tests should be updated to accept VM flags
  • ... and 10 more: https://git.openjdk.org/jdk21u-dev/compare/966071a5f10a7a8910b2639e10c961924a07d675...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 9, 2024

@shipilev Pushed as commit 1a9c7ec.

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

@shipilev shipilev deleted the JDK-8318082-cme-indexwriter branch February 7, 2024 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
4 participants