Store agent nodes in order

kylecarbs · kylecarbs · commit 08b9681baac8 · 2022-10-17T03:03:16.000Z
diff --git a/enterprise/tailnet/coordinator.go b/enterprise/tailnet/coordinator.go
@@ -266,6 +266,13 @@ func (c *haCoordinator) handleAgentUpdate(id uuid.UUID, decoder *json.Decoder) (
 	}
 
 	c.mutex.Lock()
+	oldNode := c.nodes[id]
+	if oldNode != nil {
+		if oldNode.AsOf.After(node.AsOf) {
+			c.mutex.Unlock()
+			return oldNode, nil
+		}
+	}
 	c.nodes[id] = &node
 	connectionSockets, ok := c.agentToConnectionSockets[id]
 	if !ok {
diff --git a/tailnet/conn.go b/tailnet/conn.go
@@ -435,6 +435,7 @@ func (c *Conn) sendNode() {
 	}
 	node := &Node{
 		ID:            c.netMap.SelfNode.ID,
+		AsOf:          c.lastStatus,
 		Key:           c.netMap.SelfNode.Key,
 		Addresses:     c.netMap.SelfNode.Addresses,
 		AllowedIPs:    c.netMap.SelfNode.AllowedIPs,
diff --git a/tailnet/coordinator.go b/tailnet/coordinator.go
@@ -37,6 +37,8 @@ type Coordinator interface {
 type Node struct {
 	// ID is used to identify the connection.
 	ID tailcfg.NodeID `json:"id"`
+	// AsOf is the time the node was created.
+	AsOf time.Time `json:"as_of"`
 	// Key is the Wireguard public key of the node.
 	Key key.NodePublic `json:"key"`
 	// DiscoKey is used for discovery messages over DERP to establish peer-to-peer connections.

Original file line number	Diff line number	Diff line change
`@@ -435,6 +435,7 @@ func (c *Conn) sendNode() {`
`435`	`435`	`}`
`436`	`436`	`node := &Node{`
`437`	`437`	`ID: c.netMap.SelfNode.ID,`
	`438`	`+ AsOf: c.lastStatus,`
`438`	`439`	`Key: c.netMap.SelfNode.Key,`
`439`	`440`	`Addresses: c.netMap.SelfNode.Addresses,`
`440`	`441`	`AllowedIPs: c.netMap.SelfNode.AllowedIPs,`