From 27f8f9092fa3a1699153189271e06b5ae60f93dc Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Fri, 29 May 2020 09:08:36 +0000 Subject: [PATCH 1/2] router: tell goroutine to exit when forwarder is stopped Otherwise a goroutine is leaked each time a connection is closed. --- router/overlay_switch.go | 1 + 1 file changed, 1 insertion(+) diff --git a/router/overlay_switch.go b/router/overlay_switch.go index 7fcd564d..b99d621a 100644 --- a/router/overlay_switch.go +++ b/router/overlay_switch.go @@ -452,6 +452,7 @@ func (fwd *overlaySwitchForwarder) Stop() { fwd.lock.Lock() defer fwd.lock.Unlock() fwd.stopFrom(0) + close(fwd.stopChan) } func (fwd *overlaySwitchForwarder) ControlMessage(tag byte, msg []byte) { From e0348233af3f61edc0868176d372b6eb67014c3a Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 10 Jun 2020 13:41:13 +0000 Subject: [PATCH 2/2] Add release v2.6.5 --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 463d7365..eb884f49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## Release 2.6.5 + +Fixes a bug that would leak memory every time a fast-datapath connection +was stopped. #3808 +Also avoid a crash when the machine has ipv6 disabled. #3815 + + ## Release 2.6.4 Improves the iptables rule added in 2.6.3 to block just the Weave Net