fix: use a native websocket.NetConn for agent RPC client #13142
Merged
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
This stack of pull requests is managed by Graphite. Learn more about stacking. Join @spikecurtis and the rest of your teammates on |
This was referenced May 3, 2024
mafredri
reviewed
May 3, 2024
| // Set the read limit to 4 MiB -- about the limit for protobufs. This needs to be larger than | ||
| // the default because some of our protocols can include large messages like startup scripts. | ||
| conn.SetReadLimit(1 << 22) | ||
| netConn := websocket.NetConn(ctx, conn, websocket.MessageBinary) |
There was a problem hiding this comment.
Since this is no longer wrapped via custom closer below, there's a slight change in behavior, this will be used instead:
c.c.Close(StatusNormalClosure, "")There was a problem hiding this comment.
True, but I don't think it matters in any meaningful way. The server doesn't act any differently based on the close code or message.
9392155 to
92f0f66
Compare
f684439 to
ac491e5
Compare
92f0f66 to
094ce97
Compare
ac491e5 to
505cd04
Compare
mafredri
approved these changes
May 6, 2024
094ce97 to
4e4c469
Compare
505cd04 to
c0536b6
Compare
4e4c469 to
4ad81b0
Compare
c0536b6 to
667b718
Compare
Merge activity
|
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.
One cause of #13139 is a peculiar failure mode of
WebsocketNetConnwhich causes it to returncontext.Canceledin some circumstances when the underlying websocket fails. We have special processing for that error in theagent.run()routine, which is erroneously being triggered.Since we don't actually need the returned context from
WebsocketNetConn, we can simplify and just use the netConn from thewebsocketlibrary directly.