Skip to content

Skip unnecessary disconnect and wait for disconnect to finish in shutdown #10031

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

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

yyforyongyu
Copy link
Member

Was debugging reconnection behavior in quiescence and found a few behaviors that can be improved:

  • when peer is already disconnected, no need to disconnect again.
  • fixed a case the peer may be stuck in WaitForDisconnect
  • similar to this comment, we want to make sure we wait for goroutines to finish when shutting down.

We add more detailed logging so it's eaiser to observe the overall flow.
We now make sure when we are waiting for the signal `ready`, if the peer
quits, we also exit this method immediately.
There's no need to disconnect if the peer has already been disconnected.
@yyforyongyu yyforyongyu added this to the v0.20.0 milestone Jul 4, 2025
@yyforyongyu yyforyongyu requested a review from ziggie1984 July 4, 2025 00:38
@yyforyongyu yyforyongyu self-assigned this Jul 4, 2025
@yyforyongyu yyforyongyu added p2p Code related to the peer-to-peer behaviour code health Related to code commenting, refactoring, and other non-behaviour improvements labels Jul 4, 2025
@yyforyongyu yyforyongyu added bug fix size/micro small bug fix or feature, less than 15 mins of review, less than 250 labels Jul 4, 2025
Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Summary of Changes

Hello @yyforyongyu, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request refines the peer disconnection and shutdown mechanisms within the Brontide peer implementation and the server's peer management. The primary goal is to enhance robustness and efficiency by preventing redundant disconnect operations, resolving a potential deadlock in the WaitForDisconnect routine, and ensuring that all peer-related goroutines gracefully complete during shutdown.

Highlights

  • Improved Disconnection Idempotency: The Disconnect method now explicitly checks if a peer is already in the process of disconnecting, preventing redundant calls and logging a warning if an unnecessary disconnect is attempted. Similarly, the Start method now logs a warning if called on an already started peer.
  • Resolved WaitForDisconnect Deadlock: The WaitForDisconnect routine has been updated to correctly handle cases where the peer might quit prematurely, ensuring it doesn't get stuck waiting indefinitely by adding return statements in select cases for p.cg.Done().
  • Ensured Goroutine Termination on Shutdown: The server's DisconnectPeer method now properly tracks the peer disconnection goroutine using a sync.WaitGroup, guaranteeing that the server waits for this operation to complete before fully shutting down.
  • Enhanced Logging for Peer Lifecycle: Added more detailed trace and debug logging to various peer lifecycle methods (Start, WaitForDisconnect, Disconnect, readHandler, writeHandler) to provide better visibility into peer state transitions and disconnection flows.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request refactors the peer shutdown logic to be more robust and observable. Key changes include using CompareAndSwap for start-once logic, fixing a potential hang in WaitForDisconnect, adding more detailed logging, and ensuring the server waits for peer disconnection goroutines to complete on shutdown. The changes are well-reasoned and improve the overall stability of peer lifecycle management. I have one suggestion to make the readHandler's disconnect logic even more robust by providing a default error reason.

@lightninglabs-deploy
Copy link

@ziggie1984: review reminder
@yyforyongyu, remember to re-request review from reviewers when ready

Copy link
Collaborator

@ziggie1984 ziggie1984 left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for the improvement

case <-p.cg.Done():
p.log.Trace("-peer quit, exit waiting for signal startReady")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nit: what is this dash at the beginning ?

@@ -2751,7 +2759,7 @@ out:
}

case <-p.cg.Done():
exitErr = lnpeer.ErrPeerExiting
p.log.Debug("peer quit, exit writeHandler")
Copy link
Collaborator

Choose a reason for hiding this comment

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

why don't we want to record the peerExiting error anymore ?

@ziggie1984
Copy link
Collaborator

fixed a case the peer may be stuck in WaitForDisconnect

curious why this case was hit because normally we wait for all the peer goroutines to finish and if the Done() channel was closed normally this should finish as well, I don't really see the bug at first glance.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug fix code health Related to code commenting, refactoring, and other non-behaviour improvements p2p Code related to the peer-to-peer behaviour size/micro small bug fix or feature, less than 15 mins of review, less than 250
Projects
Status: No status
Development

Successfully merging this pull request may close these issues.

3 participants