Skip to content

Commit 58bf0ec

Browse files
ethanndicksonethanndickson
authored
chore: add additional tailnet topology integration tests (coder#13549)
1 parent ba7d183 commit 58bf0ec

File tree

2 files changed

+135
-6
lines changed

2 files changed

+135
-6
lines changed

‎tailnet/test/integration/integration.go

Lines changed: 81 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,64 @@ type SimpleServerOptions struct {
111111

112112
var _ ServerStarter = SimpleServerOptions{}
113113

114+
type connManager struct {
115+
mu sync.Mutex
116+
conns map[uuid.UUID]net.Conn
117+
}
118+
119+
func (c *connManager) Add(id uuid.UUID, conn net.Conn) func() {
120+
c.mu.Lock()
121+
defer c.mu.Unlock()
122+
c.conns[id] = conn
123+
return func() {
124+
c.mu.Lock()
125+
defer c.mu.Unlock()
126+
delete(c.conns, id)
127+
}
128+
}
129+
130+
func (c *connManager) CloseAll() {
131+
c.mu.Lock()
132+
defer c.mu.Unlock()
133+
for _, conn := range c.conns {
134+
_ = conn.Close()
135+
}
136+
c.conns = make(map[uuid.UUID]net.Conn)
137+
}
138+
139+
type derpServer struct {
140+
http.Handler
141+
srv *derp.Server
142+
closeFn func()
143+
}
144+
145+
func newDerpServer(t *testing.T, logger slog.Logger) *derpServer {
146+
derpSrv := derp.NewServer(key.NewNode(), tailnet.Logger(logger.Named("derp")))
147+
derpHandler, derpCloseFunc := tailnet.WithWebsocketSupport(derpSrv, derphttp.Handler(derpSrv))
148+
t.Cleanup(derpCloseFunc)
149+
return &derpServer{
150+
srv: derpSrv,
151+
Handler: derpHandler,
152+
closeFn: derpCloseFunc,
153+
}
154+
}
155+
156+
func (s *derpServer) Close() {
157+
s.srv.Close()
158+
s.closeFn()
159+
}
160+
114161
//nolint:revive
115162
func (o SimpleServerOptions) Router(t *testing.T, logger slog.Logger) *chi.Mux {
116163
coord := tailnet.NewCoordinator(logger)
117164
var coordPtr atomic.Pointer[tailnet.Coordinator]
118165
coordPtr.Store(&coord)
119166
t.Cleanup(func() { _ = coord.Close() })
120167

168+
cm := connManager{
169+
conns: make(map[uuid.UUID]net.Conn),
170+
}
171+
121172
csvc, err := tailnet.NewClientService(logger, &coordPtr, 10*time.Minute, func() *tailcfg.DERPMap {
122173
return &tailcfg.DERPMap{
123174
// Clients will set their own based on their custom access URL.
@@ -126,9 +177,11 @@ func (o SimpleServerOptions) Router(t *testing.T, logger slog.Logger) *chi.Mux {
126177
})
127178
require.NoError(t, err)
128179

129-
derpServer := derp.NewServer(key.NewNode(), tailnet.Logger(logger.Named("derp")))
130-
derpHandler, derpCloseFunc := tailnet.WithWebsocketSupport(derpServer, derphttp.Handler(derpServer))
131-
t.Cleanup(derpCloseFunc)
180+
derpServer := atomic.Pointer[derpServer]{}
181+
derpServer.Store(newDerpServer(t, logger))
182+
t.Cleanup(func() {
183+
derpServer.Load().Close()
184+
})
132185

133186
r := chi.NewRouter()
134187
r.Use(
@@ -166,11 +219,32 @@ func (o SimpleServerOptions) Router(t *testing.T, logger slog.Logger) *chi.Mux {
166219
return
167220
}
168221

169-
derpHandler.ServeHTTP(w, r)
222+
derpServer.Load().ServeHTTP(w, r)
170223
})
171224
r.Get("/latency-check", func(w http.ResponseWriter, r *http.Request) {
172225
w.WriteHeader(http.StatusOK)
173226
})
227+
r.Post("/restart", func(w http.ResponseWriter, r *http.Request) {
228+
oldServer := derpServer.Swap(newDerpServer(t, logger))
229+
oldServer.Close()
230+
w.WriteHeader(http.StatusOK)
231+
})
232+
})
233+
234+
// /restart?derp=[true|false]&coordinator=[true|false]
235+
r.Post("/restart", func(w http.ResponseWriter, r *http.Request) {
236+
if r.URL.Query().Get("derp") == "true" {
237+
logger.Info(r.Context(), "killing DERP server")
238+
oldServer := derpServer.Swap(newDerpServer(t, logger))
239+
oldServer.Close()
240+
logger.Info(r.Context(), "restarted DERP server")
241+
}
242+
243+
if r.URL.Query().Get("coordinator") == "true" {
244+
logger.Info(r.Context(), "simulating coordinator restart")
245+
cm.CloseAll()
246+
}
247+
w.WriteHeader(http.StatusOK)
174248
})
175249

176250
r.Get("/api/v2/workspaceagents/{id}/coordinate", func(w http.ResponseWriter, r *http.Request) {
@@ -199,6 +273,9 @@ func (o SimpleServerOptions) Router(t *testing.T, logger slog.Logger) *chi.Mux {
199273
ctx, wsNetConn := codersdk.WebsocketNetConn(ctx, conn, websocket.MessageBinary)
200274
defer wsNetConn.Close()
201275

276+
cleanFn := cm.Add(id, wsNetConn)
277+
defer cleanFn()
278+
202279
err = csvc.ServeConnV2(ctx, wsNetConn, tailnet.StreamID{
203280
Name: "client-" + id.String(),
204281
ID: id,

‎tailnet/test/integration/suite.go

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
package integration
55

66
import (
7+
"net/http"
78
"net/url"
89
"testing"
10+
"time"
911

1012
"github.com/stretchr/testify/require"
1113

@@ -14,9 +16,34 @@ import (
1416
"github.com/coder/coder/v2/testutil"
1517
)
1618

19+
// nolint:revive
20+
func sendRestart(t *testing.T, serverURL *url.URL, derp bool, coordinator bool) {
21+
t.Helper()
22+
ctx := testutil.Context(t, 2*time.Second)
23+
24+
serverURL, err := url.Parse(serverURL.String() + "/restart")
25+
q := serverURL.Query()
26+
if derp {
27+
q.Set("derp", "true")
28+
}
29+
if coordinator {
30+
q.Set("coordinator", "true")
31+
}
32+
serverURL.RawQuery = q.Encode()
33+
require.NoError(t, err)
34+
35+
req, err := http.NewRequestWithContext(ctx, http.MethodPost, serverURL.String(), nil)
36+
require.NoError(t, err)
37+
resp, err := http.DefaultClient.Do(req)
38+
require.NoError(t, err)
39+
defer resp.Body.Close()
40+
41+
require.Equal(t, http.StatusOK, resp.StatusCode, "unexpected status code %d", resp.StatusCode)
42+
}
43+
1744
// TODO: instead of reusing one conn for each suite, maybe we should make a new
1845
// one for each subtest?
19-
func TestSuite(t *testing.T, _ slog.Logger, _ *url.URL, conn *tailnet.Conn, _, peer Client) {
46+
func TestSuite(t *testing.T, _ slog.Logger, serverURL *url.URL, conn *tailnet.Conn, _, peer Client) {
2047
t.Parallel()
2148

2249
t.Run("Connectivity", func(t *testing.T) {
@@ -26,5 +53,30 @@ func TestSuite(t *testing.T, _ slog.Logger, _ *url.URL, conn *tailnet.Conn, _, p
2653
require.NoError(t, err, "ping peer")
2754
})
2855

29-
// TODO: more
56+
t.Run("RestartDERP", func(t *testing.T) {
57+
peerIP := tailnet.IPFromUUID(peer.ID)
58+
_, _, _, err := conn.Ping(testutil.Context(t, testutil.WaitLong), peerIP)
59+
require.NoError(t, err, "ping peer")
60+
sendRestart(t, serverURL, true, false)
61+
_, _, _, err = conn.Ping(testutil.Context(t, testutil.WaitLong), peerIP)
62+
require.NoError(t, err, "ping peer after derp restart")
63+
})
64+
65+
t.Run("RestartCoordinator", func(t *testing.T) {
66+
peerIP := tailnet.IPFromUUID(peer.ID)
67+
_, _, _, err := conn.Ping(testutil.Context(t, testutil.WaitLong), peerIP)
68+
require.NoError(t, err, "ping peer")
69+
sendRestart(t, serverURL, false, true)
70+
_, _, _, err = conn.Ping(testutil.Context(t, testutil.WaitLong), peerIP)
71+
require.NoError(t, err, "ping peer after coordinator restart")
72+
})
73+
74+
t.Run("RestartBoth", func(t *testing.T) {
75+
peerIP := tailnet.IPFromUUID(peer.ID)
76+
_, _, _, err := conn.Ping(testutil.Context(t, testutil.WaitLong), peerIP)
77+
require.NoError(t, err, "ping peer")
78+
sendRestart(t, serverURL, true, true)
79+
_, _, _, err = conn.Ping(testutil.Context(t, testutil.WaitLong), peerIP)
80+
require.NoError(t, err, "ping peer after restart")
81+
})
3082
}

0 commit comments

Comments
 (0)