Skip to content

fix(core/txpool): avoid blocking reset completion on close #31030#2175

Open
gzliudan wants to merge 2 commits intoXinFinOrg:dev-upgradefrom
gzliudan:txpool-terminate-sp-reset-gr
Open

fix(core/txpool): avoid blocking reset completion on close #31030#2175
gzliudan wants to merge 2 commits intoXinFinOrg:dev-upgradefrom
gzliudan:txpool-terminate-sp-reset-gr

Conversation

@gzliudan
Copy link
Collaborator

@gzliudan gzliudan commented Mar 11, 2026 •
edited
Loading

Proposed changes

Ref: ethereum#31030

Types of changes

What types of changes does your code introduce to XDC network?
Put an ✅ in the boxes that apply

  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Changes that don't change source code or tests
  • docs: Documentation only changes
  • feat: A new feature
  • fix: A bug fix
  • perf: A code change that improves performance
  • refactor: A code change that neither fixes a bug nor adds a feature
  • revert: Revert something
  • style: Changes that do not affect the meaning of the code
  • test: Adding missing tests or correcting existing tests

Impacted Components

Which parts of the codebase does this PR touch?
Put an ✅ in the boxes that apply

  • Consensus
  • Account
  • Network
  • Geth
  • Smart Contract
  • External components
  • Not sure (Please specify below)

Checklist

Put an ✅ in the boxes once you have confirmed below actions (or provide reasons on not doing so) that

  • This PR has sufficient test coverage (unit/integration test) OR I have provided reason in the PR description for not having test coverage
  • Tested on a private network from the genesis block and monitored the chain operating correctly for multiple epochs.
  • Provide an end-to-end test plan in the PR description on how to manually test it on the devnet/testnet.
  • Tested the backwards compatibility.
  • Tested with XDC nodes running this version co-exist with those running the previous version.
  • Relevant documentation has been updated as part of this PR
  • N/A

Copilot AI review requested due to automatic review settings March 11, 2026 10:32
@coderabbitai
Copy link

coderabbitai bot commented Mar 11, 2026 •
edited
Loading

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 62acb97e-5b0f-4084-8a1a-fafac08074a7

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
📝 Coding Plan
  • Generate coding plan for human review comments

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Copilot AI reviewed Mar 11, 2026
View reviewed changes
Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR fixes a shutdown edge case in core/txpool where an in-flight reset goroutine could block trying to report completion while the pool is closing (because the main loop stops receiving reset completion signals).

Changes:

  • Add a term termination channel to TxPool, closed when the pool loop exits.
  • Make the reset goroutine’s completion signal (resetDone <- newHead) abortable on shutdown by selecting on term.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@gzliudan gzliudan force-pushed the txpool-terminate-sp-reset-gr branch from b47d3bb to 0c515f3 Compare March 12, 2026 16:23
@gzliudan gzliudan changed the title fix(core/txpool): avoid blocking reset completion on close #28837 #31030 fix(core/txpool): avoid blocking reset completion on close #31030 Mar 12, 2026
gzliudan added 2 commits March 13, 2026 15:06
@gzliudan
fix(core/txpool): coordinate reset lifecycle and shutdown signaling e…
4f7c369 
…thereum#28837

Improve txpool loop synchronization around background resets.

This change:
- adds an explicit termination channel to signal pool shutdown
- tracks forced-reset intent and a waiter channel inside the reset loop
- ensures reset waiters are notified on completion or on pool termination
- allows an explicit sync request path to trigger an additional reset round when needed

Scope is limited to internal txpool concurrency control in core/txpool/txpool.go, with no protocol or RPC behavior change.
@gzliudan
fix(core/txpool): avoid blocking reset completion on close ethereum#3…
ee31c43 
…1030
@gzliudan gzliudan force-pushed the txpool-terminate-sp-reset-gr branch from 0c515f3 to ee31c43 Compare March 13, 2026 07:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@benjamin202410 benjamin202410 benjamin202410 approved these changes

@liam-lai liam-lai Awaiting requested review from liam-lai

@AnilChinchawale AnilChinchawale Awaiting requested review from AnilChinchawale

@wanwiset25 wanwiset25 Awaiting requested review from wanwiset25

@anunay-xin anunay-xin Awaiting requested review from anunay-xin

At least 3 approving reviews are required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@gzliudan @benjamin202410