TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-01 05:52:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: clean up derp http servers on shutdown.

Browse Source 
Failure to do this leads to fd exhaustion at -count=10000,
and increasingly poor execution north of -count=100.

Signed-off-by: David Anderson <danderson@tailscale.com>
This commit is contained in:
David Anderson 2020-03-10 17:31:27 -07:00
parent d651715528
commit 7eda3af034
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wgengine/magicsock/magicsock_test.go
View File

@ -267,7 +267,6 @@ func runDERP(t *testing.T) (s *derp.Server, addr string, cleanupFn func()) {
} }
s = derp.NewServer(serverPrivateKey, t.Logf) s = derp.NewServer(serverPrivateKey, t.Logf)
// TODO: cleanup httpsrv.CloseClientConnections / Close
httpsrv := httptest.NewUnstartedServer(derphttp.Handler(s)) httpsrv := httptest.NewUnstartedServer(derphttp.Handler(s))
httpsrv.Config.TLSNextProto = make(map[string]func(*http.Server, *tls.Conn, http.Handler)) httpsrv.Config.TLSNextProto = make(map[string]func(*http.Server, *tls.Conn, http.Handler))
@ -276,6 +275,8 @@ func runDERP(t *testing.T) (s *derp.Server, addr string, cleanupFn func()) {
addr = strings.TrimPrefix(httpsrv.URL, "https://") addr = strings.TrimPrefix(httpsrv.URL, "https://")
cleanupFn = func() { cleanupFn = func() {
httpsrv.CloseClientConnections()
httpsrv.Close()
s.Close() s.Close()
} }