fix: extend locking in wsproxy to avoid race (and fix flake) (#14167)

sreya · web-flow · commit 203f48af5660 · 2024-08-05T14:30:44.000-04:00
diff --git a/enterprise/wsproxy/wsproxy.go b/enterprise/wsproxy/wsproxy.go
@@ -463,7 +463,7 @@ func (s *Server) pingSiblingReplicas(replicas []codersdk.Replica) {
 	errStr := pingSiblingReplicas(ctx, s.Logger, &s.replicaPingSingleflight, s.derpMeshTLSConfig, replicas)
 	s.replicaErrMut.Lock()
 	s.replicaErr = errStr
-	s.replicaErrMut.Unlock()
+	defer s.replicaErrMut.Unlock()
 	if s.Options.ReplicaErrCallback != nil {
 		s.Options.ReplicaErrCallback(replicas, s.replicaErr)
 	}
diff --git a/enterprise/wsproxy/wsproxy_test.go b/enterprise/wsproxy/wsproxy_test.go
@@ -312,7 +312,7 @@ resourceLoop:
 		t.Parallel()
 
 		// Try to connect to the DERP server on the no-derp-proxy region.
-		client, err := derphttp.NewClient(key.NewNode(), proxyAPI3.Options.AccessURL.String(), func(format string, args ...any) {})
+		client, err := derphttp.NewClient(key.NewNode(), proxyAPI3.Options.AccessURL.String(), func(string, ...any) {})
 		require.NoError(t, err)
 
 		ctx := testutil.Context(t, testutil.WaitLong)
@@ -405,7 +405,7 @@ func TestDERPEndToEnd(t *testing.T) {
 		proxyOnlyDERPMap.OmitDefaultRegions = true
 		return true
 	}, testutil.WaitLong, testutil.IntervalMedium)
-	newDERPMapper := func(derpMap *tailcfg.DERPMap) *tailcfg.DERPMap {
+	newDERPMapper := func(_ *tailcfg.DERPMap) *tailcfg.DERPMap {
 		return proxyOnlyDERPMap
 	}
 	api.AGPL.DERPMapper.Store(&newDERPMapper)
@@ -577,7 +577,7 @@ func TestWorkspaceProxyDERPMeshProbe(t *testing.T) {
 	registerBrokenProxy := func(ctx context.Context, t *testing.T, primaryAccessURL *url.URL, accessURL, token string) uuid.UUID {
 		t.Helper()
 		// Create a HTTP server that always replies with 500.
-		srv := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+		srv := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, _ *http.Request) {
 			rw.WriteHeader(http.StatusInternalServerError)
 		}))
 		t.Cleanup(srv.Close)
@@ -848,7 +848,7 @@ func TestWorkspaceProxyDERPMeshProbe(t *testing.T) {
 		proxy := coderdenttest.NewWorkspaceProxyReplica(t, api, client, &coderdenttest.ProxyOptions{
 			Name:     "proxy-2",
 			ProxyURL: proxyURL,
-			ReplicaPingCallback: func(replicas []codersdk.Replica, err string) {
+			ReplicaPingCallback: func(_ []codersdk.Replica, err string) {
 				replicaPingErr <- err
 			},
 		})

Original file line number	Diff line number	Diff line change
`@@ -463,7 +463,7 @@ func (s *Server) pingSiblingReplicas(replicas []codersdk.Replica) {`
`463`	`463`	`errStr := pingSiblingReplicas(ctx, s.Logger, &s.replicaPingSingleflight, s.derpMeshTLSConfig, replicas)`
`464`	`464`	`s.replicaErrMut.Lock()`
`465`	`465`	`s.replicaErr = errStr`
`466`		`- s.replicaErrMut.Unlock()`
	`466`	`+ defer s.replicaErrMut.Unlock()`
`467`	`467`	`if s.Options.ReplicaErrCallback != nil {`
`468`	`468`	`s.Options.ReplicaErrCallback(replicas, s.replicaErr)`
`469`	`469`	`}`