adelorenzo/kilo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkg/mesh: ensure persistent-keepalive set on nodes

Browse Source 
A bug identified by @carlosrmendes caused nodes to ignore the
persistent-keepalive annotation.

xref: https://github.com/squat/kilo/issues/53#issuecomment-620945927

Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
This commit is contained in:
Lucas Servén Marín 2020-04-30 13:53:38 +02:00
parent bc4e564c85
commit e4829832c5
No known key found for this signature in database
GPG Key ID: 586FEAF680DA74AD
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/mesh/mesh.go
View File

@ -478,15 +478,16 @@ func (m *Mesh) handleLocal(n *Node) {
// Take leader, location, and subnet from the argument, as these // Take leader, location, and subnet from the argument, as these
// are not determined by kilo. // are not determined by kilo.
local := &Node{ local := &Node{
Endpoint: n.Endpoint, Endpoint: n.Endpoint,
Key: m.pub, Key: m.pub,
InternalIP: n.InternalIP, InternalIP: n.InternalIP,
LastSeen: time.Now().Unix(), LastSeen: time.Now().Unix(),
Leader: n.Leader, Leader: n.Leader,
Location: n.Location, Location: n.Location,
Name: m.hostname, Name: m.hostname,
Subnet: n.Subnet, PersistentKeepalive: n.PersistentKeepalive,
WireGuardIP: m.wireGuardIP, Subnet: n.Subnet,
WireGuardIP: m.wireGuardIP,
} }
if !nodesAreEqual(n, local) { if !nodesAreEqual(n, local) {
level.Debug(m.logger).Log("msg", "local node differs from backend") level.Debug(m.logger).Log("msg", "local node differs from backend")