fix: ThreadId miss unlock(#1107)

[ye-xiaowei]

Motivation:

在 ThreadId lock 和 destroy ThreadId 并发情况下，可能导致 ThreadId 锁不释放

Modification:

取消判断 ThreadId 是否 destroy 来释放锁，而是只要持有就释放。因为在 onError 中可能释放锁，需要判断 isHeldByCurrentThread() 是否持有来释放锁

Result:

Fixes #1107

Summary by CodeRabbit

• Bug Fixes

  • Improved thread safety by ensuring locks are only released if held by the current thread.

• Tests

  • Adjusted test case assertion to reflect updated logic for thread handling.

[coderabbitai]

Walkthrough

The changes address potential deadlock issues in the ThreadId.java file by ensuring that the lock is only unlocked if held by the current thread. Additionally, the test assertion delta in ThreadIdTest.java has been adjusted from 10 to 20.

Changes

File Path	Change Summary
jraft-core/src/main/java/com/alipay/sofa/jraft/util/ThreadId.java	Updated the finally block to check if the lock is held by the current thread before unlocking it.
jraft-core/src/test/java/com/alipay/sofa/jraft/util/ThreadIdTest.java	Modified the assertion delta in a test method from 10 to 20.

Assessment against linked issues

Objective (Issue #1107)	Addressed	Explanation
Ensure no deadlock occurs when FSMCaller-Disruptor thread destroys Replicator while other threads wait on the lock.	✅
Validate the lock is only unlocked if held by the current thread.	✅

Poem

In the realm of code so bright,
Threads dance through day and night,
Locks now held with care,
No deadlocks to ensnare,
Tests adjusted, all set right.
🎉🐇

---

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

• X
• Mastodon
• Reddit
• LinkedIn

Tips

Chat

There are 3 ways to chat with CodeRabbit:

• Review comments: Directly reply to a review comment made by CodeRabbit. Example:
  • I pushed a fix in commit <commit_id>.
  • Generate unit testing code for this file.
  • Open a follow-up GitHub issue for this discussion.
• Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
  • @coderabbitai generate unit testing code for this file.
  • @coderabbitai modularize this function.
• PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
  • @coderabbitai generate interesting stats about this repository and render them as a table.
  • @coderabbitai show all the console.log statements in this repository.
  • @coderabbitai read src/utils.ts and generate unit testing code.
  • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
  • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

• @coderabbitai pause to pause the reviews on a PR.
• @coderabbitai resume to resume the paused reviews.
• @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
• @coderabbitai full review to do a full review from scratch and review all the files again.
• @coderabbitai summary to regenerate the summary of the PR.
• @coderabbitai resolve resolve all the CodeRabbit review comments.
• @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
• @coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (.coderabbit.yaml)

• You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
• Please see the configuration documentation for more information.
• If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

• Visit our Documentation for detailed information on how to use CodeRabbit.
• Join our Discord Community to get help, request features, and share feedback.
• Follow us on X/Twitter for updates and announcements.

[coderabbitai]

Actionable comments posted: 0

Review details

Configuration used: CodeRabbit UI
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 890033a and 52db0a2.

Files selected for processing (2)

• jraft-core/src/main/java/com/alipay/sofa/jraft/util/ThreadId.java (1 hunks)
• jraft-core/src/test/java/com/alipay/sofa/jraft/util/ThreadIdTest.java (1 hunks)

Files skipped from review due to trivial changes (1)

• jraft-core/src/main/java/com/alipay/sofa/jraft/util/ThreadId.java

Additional comments not posted (1)

jraft-core/src/test/java/com/alipay/sofa/jraft/util/ThreadIdTest.java (1)

62-62: Adjustment of the delta value in the assertion.

Please add a comment explaining the reason for changing the delta from 10 to 20. This helps maintain clarity for future maintainers regarding the expected behavior and any observed flakiness or timing changes in the test environment.

[fengjiachun]

@killme2008 Please take a look, and I wonder if we can just use ThreadId.unlock() to instead this.lock.unlock()?

[killme2008]

LGTM