fix(tailnet): Skip nodes without DERP, avoid use of RemoveAllPeers #6320
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mafredri
commented
Feb 23, 2023
| go func() { | ||
| err := (*api.TailnetCoordinator.Load()).ServeClient(serverConn, uuid.New(), agentID) | ||
| if err != nil { | ||
| api.Logger.Warn(r.Context(), "tailnet coordinator client error", slog.Error(err)) | ||
| _ = conn.Close() | ||
| _ = agentConn.Close() |
There was a problem hiding this comment.
Is this change OK? And should this always happen if ServeClient exits?
There was a problem hiding this comment.
Thinking more about this, it seems good!
kylecarbs
approved these changes
Feb 23, 2023
| go func() { | ||
| err := (*api.TailnetCoordinator.Load()).ServeClient(serverConn, uuid.New(), agentID) | ||
| if err != nil { | ||
| api.Logger.Warn(r.Context(), "tailnet coordinator client error", slog.Error(err)) | ||
| _ = conn.Close() | ||
| _ = agentConn.Close() |
There was a problem hiding this comment.
Thinking more about this, it seems good!
e63df40 to
a3f3776
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR targets #6292 and has two main changes:
conn.RemoveAllPeers(in favor ofconn.UpdateNodes(nodes, replace=true)AwaitReacahblefirst)The reason for 2. is that on initial connections, there's a race between receiving a valid node, removing it, and then trying to add it back, this leads to 30+ seconds delays e.g. in scaletests and sometimes timeouts.
We might be able to replace many uses of AwaitReachable with something akin to "wait until first peer node with derp". This might speed up connections by not having to do a ping.