Skip to content

fix: stop reading closed channel for /watch devcontainers endpoint #19373

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

Merged
merged 5 commits into from
Aug 15, 2025
+251 −151
Merged

fix: stop reading closed channel for /watch devcontainers endpoint #19373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
894b298
fix: stop reading closed channel for `/watch` devcontainers endpoint
DanielleMaywood Aug 15, 2025
1abe70b
chore: use NoContextTakeover compression mode
DanielleMaywood Aug 15, 2025
0ca20dc
test: add a test to validate behaviour
DanielleMaywood Aug 15, 2025
a42d658
fix: accept compression mode
DanielleMaywood Aug 15, 2025
a4c5bd3
chore: comment justifications
DanielleMaywood Aug 15, 2025
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
6 changes: 5 additions & 1 deletion agent/agentcontainers/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,11 @@ func (api *API) broadcastUpdatesLocked() {
func (api *API) watchContainers(rw http.ResponseWriter, r *http.Request) {
ctx := r.Context()

conn, err := websocket.Accept(rw, r, nil)
conn, err := websocket.Accept(rw, r, &websocket.AcceptOptions{
// We want `NoContextTakeover` compression to balance improving
// bandwidth cost/latency with minimal memory usage overhead.
CompressionMode: websocket.CompressionNoContextTakeover,
})
if err != nil {
httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
Message: "Failed to upgrade connection to websocket.",
Expand Down
6 changes: 5 additions & 1 deletion coderd/workspaceagents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,11 @@ func (api *API) watchWorkspaceAgentContainers(rw http.ResponseWriter, r *http.Re
case <-ctx.Done():
return

case containers := <-containersCh:
case containers, ok := <-containersCh:
if !ok {
return
}

if err := encoder.Encode(containers); err != nil {
api.Logger.Error(ctx, "encode containers", slog.Error(err))
return
Expand Down
Loading
Loading