Merge branch 'main' into colin/pg-coordinate

coder · coadler · Sep 22, 2022 · Sep 23, 2022 · Sep 23, 2022 · Sep 23, 2022
commit 02e079dbb656e733c66f15c62a63aa2aa37630cb
diff --git a/codersdk/workspaceagents.go b/codersdk/workspaceagents.go
@@ -21,7 +21,6 @@ import (
 	"tailscale.com/tailcfg"
 
 	"cdr.dev/slog"
-	"github.com/coder/coder/agent"
 	"github.com/coder/coder/tailnet"
 	"github.com/coder/retry"
 )

diff --git a/tailnet/coordinator.go b/tailnet/coordinator.go
@@ -195,32 +195,21 @@ func (c *memoryCoordinator) handleNextClientMessage(id, agent uuid.UUID, decoder
 	}
 
 	c.mutex.Lock()
-	defer c.mutex.Unlock()
 
-	// Update the node of this client in our in-memory map. If an agent
-	// entirely shuts down and reconnects, it needs to be aware of all clients
-	// attempting to establish connections.
+	// Update the node of this client in our in-memory map. If an agent entirely
+	// shuts down and reconnects, it needs to be aware of all clients attempting
+	// to establish connections.
 	c.nodes[id] = &node
 
-	// Write the new node from this client to the actively
-	// connected agent.
-	err = c.writeNodeToAgent(agent, &node)
-	if err != nil {
-		return xerrors.Errorf("write node to agent: %w", err)
-	}
-
-	return nil
-}
-
-func (c *memoryCoordinator) writeNodeToAgent(agent uuid.UUID, node *Node) error {
 	agentSocket, ok := c.agentSockets[agent]
 	if !ok {
+		c.mutex.Unlock()
 		return nil
 	}
+	c.mutex.Unlock()
 
-	// Write the new node from this client to the actively
-	// connected agent.
-	data, err := json.Marshal([]*Node{node})
+	// Write the new node from this client to the actively connected agent.
+	data, err := json.Marshal([]*Node{&node})
 	if err != nil {
 		return xerrors.Errorf("marshal nodes: %w", err)
 	}
@@ -232,6 +221,7 @@ func (c *memoryCoordinator) writeNodeToAgent(agent uuid.UUID, node *Node) error
 		}
 		return xerrors.Errorf("write json: %w", err)
 	}
+
 	return nil
 }
 
@@ -299,16 +289,17 @@ func (c *memoryCoordinator) handleNextAgentMessage(id uuid.UUID, decoder *json.D
 	}
 
 	c.mutex.Lock()
-	defer c.mutex.Unlock()
 
 	c.nodes[id] = &node
 	connectionSockets, ok := c.agentToConnectionSockets[id]
 	if !ok {
+		c.mutex.Unlock()
 		return nil
 	}
 
 	data, err := json.Marshal([]*Node{&node})
 	if err != nil {
+		c.mutex.Unlock()
 		return xerrors.Errorf("marshal nodes: %w", err)
 	}
 
@@ -324,6 +315,7 @@ func (c *memoryCoordinator) handleNextAgentMessage(id uuid.UUID, decoder *json.D
 		}()
 	}
 
+	c.mutex.Unlock()
 	wg.Wait()
 	return nil
 }