Skip to content

feat: add derp mesh health checking in workspace proxies #12222

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 6 commits into from
Mar 8, 2024
Merged

feat: add derp mesh health checking in workspace proxies #12222

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9cd470a
chore: add test for workspace proxy derp meshing
deansheather Feb 20, 2024
a754acf
Reduce replicas to 6 in test, test all paths
deansheather Feb 20, 2024
79a79e9
feat: add derp mesh health checking in workspace proxies
deansheather Feb 20, 2024
45791ae
PR comments
deansheather Feb 23, 2024
9a0b28f
Merge branch 'main' into 02-20-feat_add_derp_mesh_health_checking_in_…
deansheather Mar 5, 2024
268115d
PR comments
deansheather Mar 8, 2024
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
Prev Previous commit
Next Next commit
Reduce replicas to 6 in test, test all paths
  • Loading branch information
@deansheather
deansheather committed Feb 20, 2024
commit a754acfe8b9c8d1ca79c5793859d5637d2d11a85
38 changes: 22 additions & 16 deletions enterprise/wsproxy/wsproxy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ resourceLoop:
require.False(t, p2p)
}

// TestDERPMesh spawns 10 workspace proxy replicas and tries to connect to a
// TestDERPMesh spawns 6 workspace proxy replicas and tries to connect to a
// single DERP peer via every single one.
func TestDERPMesh(t *testing.T) {
t.Parallel()
Expand Down Expand Up @@ -472,8 +472,8 @@ func TestDERPMesh(t *testing.T) {
proxyURL, err := url.Parse("https://proxy.test.coder.com")
require.NoError(t, err)

// Create 10 proxy replicas.
const count = 10
// Create 6 proxy replicas.
const count = 6
var (
sessionToken = ""
proxies = [count]coderdenttest.WorkspaceProxy{}
Expand Down Expand Up @@ -509,6 +509,9 @@ func TestDERPMesh(t *testing.T) {
t.Logf(name+": "+format, args...)
})
require.NoError(t, err, "create client")
t.Cleanup(func() {
_ = client.Close()
})
err = client.Connect(testutil.Context(t, testutil.WaitLong))
require.NoError(t, err, "connect to DERP server")

Expand Down Expand Up @@ -568,23 +571,26 @@ func TestDERPMesh(t *testing.T) {
}
}

// Generate cases. We have a case for:
// - Each proxy to itself.
// - Each proxy to each other proxy (one way, no duplicates).
cases := [][2]string{}
for i, derpURL := range derpURLs {
i, derpURL := i, derpURL
cases = append(cases, [2]string{derpURL, derpURL})
for j := i + 1; j < len(derpURLs); j++ {
cases = append(cases, [2]string{derpURL, derpURLs[j]})
}
}
require.Len(t, cases, (count*(count+1))/2) // triangle number

for i, c := range cases {
i, c := i, c
t.Run(fmt.Sprintf("Proxy%d", i), func(t *testing.T) {
t.Parallel()
t.Logf("derp1=%s, derp2=%s", derpURLs[0], derpURL)

// Client 1 is always on the first proxy as a "control".
client1, client1Recv := createClient(t, "client1", derpURLs[0])
t.Cleanup(func() {
_ = client1.Close()
})

// Client 2 is on the current proxy.
client2, client2Recv := createClient(t, "client2", derpURL)
t.Cleanup(func() {
_ = client2.Close()
})
t.Logf("derp1=%s, derp2=%s", c[0], c[1])
client1, client1Recv := createClient(t, "client1", c[0])
client2, client2Recv := createClient(t, "client2", c[1])

// Send a packet from client 1 to client 2.
sendTest(t, client2.SelfPublicKey(), client2Recv, client1)
Expand Down