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

8325179: Race in BasicDirectoryModel.validateFileCache #164

Closed

Conversation

aivanov-jdk
Copy link
Member

@aivanov-jdk aivanov-jdk commented Apr 24, 2024

Backporting JDK-8325179: Race in BasicDirectoryModel.validateFileCache.

The patch applies cleanly. (After applying JDK-8327137.)


Progress

  • Change must not contain extraneous whitespace
  • JDK-8325179 needs maintainer approval
  • Commit message must refer to an issue
  • JDK-8238169 needs maintainer approval

Issues

  • JDK-8325179: Race in BasicDirectoryModel.validateFileCache (Bug - P3 - Approved)
  • JDK-8238169: BasicDirectoryModel getDirectories and DoChangeContents.run can deadlock (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 164

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk22u/pull/164.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 24, 2024

👋 Welcome back aivanov! 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 Apr 24, 2024

@aivanov-jdk 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:

8325179: Race in BasicDirectoryModel.validateFileCache
8238169: BasicDirectoryModel getDirectories and DoChangeContents.run can deadlock

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

  • 0f4bc65: 8328168: Epsilon: Premature OOM when allocating object larger than uncommitted heap size
  • 71d0fcf: 8330156: RISC-V: Range check auipc + signed 12 imm instruction

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 changed the title Backport e66788c16563d343f6cccd2807a251ccc6f9b64a 8325179: Race in BasicDirectoryModel.validateFileCache Apr 24, 2024
@openjdk
Copy link

openjdk bot commented Apr 24, 2024

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

@openjdk
Copy link

openjdk bot commented Apr 24, 2024

⚠️ @aivanov-jdk 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.

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 24, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 24, 2024

Webrevs

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Apr 24, 2024
@aivanov-jdk
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Apr 29, 2024

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

  • 7381b84: 8320692: Null icon returned for .exe without custom icon
  • 5eb11e5: 8310513: [s390x] Intrinsify recursive ObjectMonitor locking
  • 0f4bc65: 8328168: Epsilon: Premature OOM when allocating object larger than uncommitted heap size
  • 71d0fcf: 8330156: RISC-V: Range check auipc + signed 12 imm instruction

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Apr 29, 2024

@aivanov-jdk Pushed as commit e6ba0ee.

💡 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
Labels
backport clean integrated Pull request has been integrated
1 participant