Add release v2.6.2

Merge pull request #3783 from weaveworks/issue-3781
send FastDatapathCryptoInitSARemote control message only if encryption is enabled
2020-03-17 20:36:24 +05:30 · 2020-03-12 10:09:26 +00:00 · 2020-03-11 16:32:32 +00:00 · 2020-03-11 21:26:09 +05:30 · 2020-03-11 12:21:07 +00:00
3 changed files with 22 additions and 5 deletions
@@ -1,3 +1,14 @@
+## Release 2.6.2
+
+This release fixes a regression found in 2.6.1 release and removes a possible case
+of CPU spinning when pcap is used in sleeve mode
+
+### Bug fixes
+
+* Weave Net can not be used in fastdp mode and always falls back to sleeve mode #3781, #3783
+* Restrict timeout value passed to pcap library to a value less than 2^31 microseconds to
+  prevent CPU spinning #3782
+
 ## Release 2.6.1

 This release fixes a bug discovered since the release of Weave Net 2.6.0 and
@@ -694,10 +694,12 @@ func (fwd *fastDatapathForwarder) Confirm() {

 	fwd.lock.Unlock() // unlock before calling send() which may block

-	if err := fwd.sendControlMsg(FastDatapathCryptoInitSARemote, controlMsg); err != nil {
-		log.Error(fwd.logPrefix(), "ipsec send InitSARemote failed: ", err)
-		fwd.handleError(err)
-		return
+	if len(controlMsg) > 0 {
+		if err := fwd.sendControlMsg(FastDatapathCryptoInitSARemote, controlMsg); err != nil {
+			log.Error(fwd.logPrefix(), "ipsec send InitSARemote failed: ", err)
+			fwd.handleError(err)
+			return
+		}
 	}

 	go fwd.doHeartbeats()
@@ -4,10 +4,14 @@ import (
 	"fmt"
 	"net"
 	"sync"
+	"time"

 	"github.com/google/gopacket/pcap"
 )

+// Must be less than 2^31 usec - see https://github.com/google/gopacket/issues/708
+const longTimeout = time.Duration(30 * time.Minute)
+
 type Pcap struct {
 	NonDiscardingFlowOp

@@ -77,7 +81,7 @@ func newPcapHandle(ifName string, promisc bool, snaplen int, bufSz int) (handle
 	if err = inactive.SetSnapLen(snaplen); err != nil {
 		return
 	}
-	if err = inactive.SetTimeout(MaxDuration); err != nil {
+	if err = inactive.SetTimeout(longTimeout); err != nil {
 		return
 	}
 	if err = inactive.SetImmediateMode(true); err != nil {
Author	SHA1	Message	Date
Murali Reddy	14730f8572	Add release v2.6.2	2020-03-17 20:36:24 +05:30
Bryan Boreham	e7a24eaf0a	Merge pull request #3783 from weaveworks/issue-3781 send FastDatapathCryptoInitSARemote control message only if encryption is enabled	2020-03-12 10:09:26 +00:00
Bryan Boreham	15ad210bec	Merge pull request #3782 from weaveworks/fix-pcap-timeout Reduce pcap timeout to avoid overflow	2020-03-11 16:32:32 +00:00
Murali Reddy	6bc0e5e71c	send FastDatapathCryptoInitSARemote control message only if encryption is enabled Fixes #3781	2020-03-11 21:26:09 +05:30
Bryan Boreham	0ca831f50b	Reduce pcap timeout to avoid overflow The value is passed by google/gopacket into a signed 32-bit int, so we must pick a timeout which is less than 2^31 microseconds. See https://github.com/google/gopacket/issues/708	2020-03-11 12:21:07 +00:00