fix: Don't clear out peers that haven't connected yet (coder#3916)

kylecarbs · web-flow · commit dca24bd15d3e · 2022-09-06T21:27:59.000Z
This was causing parallel connections to fail, because they wouldn't
be established yet.
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -303,16 +303,19 @@ func (c *Conn) UpdateNodes(nodes []*Node) error {
 	for _, peer := range c.netMap.Peers {
 		if peerStatus, ok := status.Peer[peer.Key]; ok {
 			// Clear out inactive connections!
-			if !peerStatus.Active {
+			// If a connection hasn't been active for a minute post creation, we assume it's dead.
+			if !peerStatus.Active && peer.Created.Before(time.Now().Add(-time.Minute)) {
+				c.logger.Debug(context.Background(), "clearing peer", slog.F("peerStatus", peerStatus))
 				continue
 			}
 		}
 		peerMap[peer.ID] = peer
 	}
 	for _, node := range nodes {
 		peerStatus, ok := status.Peer[node.Key]
-		peerMap[node.ID] = &tailcfg.Node{
+		peerNode := &tailcfg.Node{
 			ID:         node.ID,
+			Created:    time.Now(),
 			Key:        node.Key,
 			DiscoKey:   node.DiscoKey,
 			Addresses:  node.Addresses,
@@ -325,6 +328,11 @@ func (c *Conn) UpdateNodes(nodes []*Node) error {
 			// reason. TODO: @kylecarbs debug this!
 			KeepAlive: ok && peerStatus.Active,
 		}
+		existingNode, ok := peerMap[node.ID]
+		if ok {
+			peerNode.Created = existingNode.Created
+		}
+		peerMap[node.ID] = peerNode
 	}
 	c.netMap.Peers = make([]*tailcfg.Node, 0, len(peerMap))
 	for _, peer := range peerMap {
