Skip to content

server: don't die on startup when persistent peer already connected #8865

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.

Sign up for GitHub

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

Draft
aakselrod wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

server: don't die on startup when persistent peer already connected #8865

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import (
"github.com/lightningnetwork/lnd/lnpeer"
"github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
"github.com/lightningnetwork/lnd/lnutils"
"github.com/lightningnetwork/lnd/lnwallet"
"github.com/lightningnetwork/lnd/lnwallet/chainfee"
"github.com/lightningnetwork/lnd/lnwallet/chanfunding"
Expand Down Expand Up @@ -2139,7 +2140,9 @@ func (s *server) Start() error {
peerAddr, true,
s.cfg.ConnectionTimeout,
)
if err != nil {
if err != nil &&
Copy link
Member

@Roasbeef Roasbeef Jun 25, 2024

Choose a reason for hiding this comment

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

Seems this would only happen if AddPeers had a duplicate? Or I guess if two DNS hosts return the same IP?

Copy link
Contributor Author

@aakselrod aakselrod Jun 27, 2024

Choose a reason for hiding this comment

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

I think it might be that the connection manager started just above accepted a connection from the configured peer before the attempt to add the peer from the config here. Unfortunately I can't get to the logs from before applying this fix any more to prove that this is what happened but I'll add an itest for this to make sure I'm going in the right direction. Thanks!

!lnutils.ErrorAs[*errPeerAlreadyConnected](err) {

startErr = fmt.Errorf("unable to connect to "+
"peer address provided as a config "+
"option: %v", err)
Expand Down