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 #2558

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Jun 10, 2024

Clean backport of JDK-8325179 and JDK-8238169 which belong together.


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/jdk17u-dev.git pull/2558/head:pull/2558
$ git checkout pull/2558

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2558

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 10, 2024

👋 Welcome back mdoerr! 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 Jun 10, 2024

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

  • d99641e: 7124313: [macosx] Swing Popups should overlap taskbar
  • 92daaf2: 8331885: C2: meet between unloaded and speculative types is not symmetric
  • 8414ee3: 8294148: Support JSplitPane for instructions and test UI
  • 6910365: 8316104: Open source several Swing SplitPane and RadioButton related tests

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 Jun 10, 2024
@openjdk
Copy link

openjdk bot commented Jun 10, 2024

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

@openjdk
Copy link

openjdk bot commented Jun 10, 2024

⚠️ @TheRealMDoerr 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 Jun 10, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 10, 2024

Webrevs

@TheRealMDoerr
Copy link
Contributor Author

/approval request Should get backported for parity with 17.0.13-oracle. Applies cleanly and tier 1-4 have passed.

@openjdk
Copy link

openjdk bot commented Jun 11, 2024

@TheRealMDoerr
8325179: The approval request has been created successfully.
8238169: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jun 11, 2024
@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 11, 2024

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

  • d3c1ad3: 8261433: Better pkcs11 performance for libpkcs11:C_EncryptInit/libpkcs11:C_DecryptInit
  • 7bc22f7: 8279164: Disable TLS_ECDH_* cipher suites
  • d99641e: 7124313: [macosx] Swing Popups should overlap taskbar
  • 92daaf2: 8331885: C2: meet between unloaded and speculative types is not symmetric
  • 8414ee3: 8294148: Support JSplitPane for instructions and test UI
  • 6910365: 8316104: Open source several Swing SplitPane and RadioButton related tests

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 11, 2024

@TheRealMDoerr Pushed as commit bc5639a.

💡 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
Development

Successfully merging this pull request may close these issues.

1 participant