Skip to content

fix(p2p,eth): synchronize pair peer teardown - #2325

Merged
gzliudan merged 1 commit into
XinFinOrg:dev-upgradefrom
gzliudan:fix-p2p-panic
Apr 28, 2026
Merged

fix(p2p,eth): synchronize pair peer teardown#2325
gzliudan merged 1 commit into
XinFinOrg:dev-upgradefrom
gzliudan:fix-p2p-panic

Conversation

@gzliudan

Copy link
Copy Markdown
Collaborator

Proposed changes

Guard PairPeer access with synchronized helpers and snapshot the pair before launching async disconnect during peer shutdown.

Add regression coverage for pair-peer teardown and keep the existing pair tracking checks using the synchronized accessors.

fix panic:

WARN [04-21|13:49:14.217] Failed to unregister sync peer           peer=f14274f155d8b9fd err="peer is not registered"
panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x50 pc=0xbf65d6]

goroutine 79891 [running]:
github.com/XinFinOrg/XDPoSChain/p2p.(*Peer).Disconnect(...)
        github.com/XinFinOrg/XDPoSChain/p2p/peer.go:159
github.com/XinFinOrg/XDPoSChain/p2p.(*Peer).run.func2()
        github.com/XinFinOrg/XDPoSChain/p2p/peer.go:239 +0x16
created by github.com/XinFinOrg/XDPoSChain/p2p.(*Peer).run in goroutine 79878
        github.com/XinFinOrg/XDPoSChain/p2p/peer.go:239 +0x3c5

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 April 21, 2026 06:24
@coderabbitai

coderabbitai Bot commented Apr 21, 2026

Copy link
Copy Markdown

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: 38809d19-148e-4060-9ed3-40cb3b7dbb24

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

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 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Synchronizes access to the p2p “pair peer” pointer and snapshots it before triggering an async disconnect during peer shutdown, addressing a teardown race that can lead to a nil dereference panic.

Changes:

  • Replace direct Peer.PairPeer field access with synchronized accessor/mutator helpers.
  • Snapshot the pair peer before launching the async disconnect in Peer.run() to avoid nil dereferences.
  • Add a regression test ensuring Peer.run() disconnects the paired peer with DiscPairPeerStop.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
p2p/peer.go Adds mutex-guarded pair-peer accessors and snapshots pair peer before async disconnect on shutdown.
p2p/server.go Uses synchronized pair-peer helpers when tracking/removing peers and validating handshakes.
p2p/dial.go Uses synchronized pair-peer getter in dial eligibility checks.
eth/peer.go Updates eth peer pairing logic to use new synchronized pair-peer setter.
p2p/server_test.go Updates tests to use the new pair-peer accessors.
p2p/peer_test.go Adds coverage that pair peer is disconnected when the primary peer stops.

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

Comment thread p2p/dial.go Outdated
Comment thread p2p/peer.go
Guard PairPeer access with synchronized helpers and snapshot the pair before launching async disconnect during peer shutdown.

Add regression coverage for pair-peer teardown and keep the existing pair tracking checks using the synchronized accessors.
@gzliudan
gzliudan merged commit 872a426 into XinFinOrg:dev-upgrade Apr 28, 2026
13 checks passed
@gzliudan
gzliudan deleted the fix-p2p-panic branch April 28, 2026 04:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants