fix: clean up idle http conns on wsconncache close (#6471)

kylecarbs · web-flow · commit cf75d7e1fb81 · 2023-03-06T20:45:49.000-06:00
See https://github.com/coder/coder/actions/runs/4346769070/jobs/7593243836
diff --git a/coderd/wsconncache/wsconncache.go b/coderd/wsconncache/wsconncache.go
@@ -121,6 +121,7 @@ func (c *Cache) Acquire(r *http.Request, id uuid.UUID) (*Conn, func(), error) {
 				}
 				c.connMap.Delete(id.String())
 				c.connGroup.Forget(id.String())
+				transport.CloseIdleConnections()
 				_ = conn.Close()
 			}()
 			return conn, nil
diff --git a/coderd/wsconncache/wsconncache_test.go b/coderd/wsconncache/wsconncache_test.go
@@ -126,15 +126,15 @@ func TestCache(t *testing.T) {
 					Host:   fmt.Sprintf("127.0.0.1:%d", tcpAddr.Port),
 					Path:   "/",
 				})
+				ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium)
+				defer cancel()
 				req := httptest.NewRequest(http.MethodGet, "/", nil)
+				req = req.WithContext(ctx)
 				conn, release, err := cache.Acquire(req, uuid.Nil)
 				if !assert.NoError(t, err) {
 					return
 				}
 				defer release()
-
-				ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitMedium)
-				defer cancel()
 				if !conn.AwaitReachable(ctx) {
 					t.Error("agent not reachable")
 					return

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,7 @@ func (c Cache) Acquire(r http.Request, id uuid.UUID) (*Conn, func(), error) {`
`121`	`121`	`}`
`122`	`122`	`c.connMap.Delete(id.String())`
`123`	`123`	`c.connGroup.Forget(id.String())`
	`124`	`+ transport.CloseIdleConnections()`
`124`	`125`	`_ = conn.Close()`
`125`	`126`	`}()`
`126`	`127`	`return conn, nil`