github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-08-18 03:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't buffer TIME_WAIT flows on conntrack start-up

Browse Source 
When the probe first starts we should only be interested in active
connections, and if the loop re-starts it's probably because too many
connections are opening and closing to keep up with, so it's good to
drop any that are already closed then too.

Refactor the code so `handleFlow` is only called on events, and handle
the initial list of connections directly.
This commit is contained in:
Bryan Boreham
2018-11-14 15:34:58 +00:00
parent c627802664
commit f4dc368955
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
probe/endpoint/conntrack.go
+14 -8
View File
@@ -100,15 +100,23 @@ func (c *conntrackWalker) clearFlows() {
c.activeFlows = map[uint32]conntrack.Conn{}
}
func (c *conntrackWalker) relevant(f conntrack.Conn) bool {
return !(c.natOnly && (f.Status&conntrack.IPS_NAT_MASK) == 0)
}
func (c *conntrackWalker) run() {
existingFlows, err := conntrack.ConnectionsSize(c.bufferSize)
if err != nil {
log.Errorf("conntrack Connections error: %v", err)
return
}
c.Lock()
for _, flow := range existingFlows {
c.handleFlow(flow, true)
if c.relevant(flow) && flow.TCPState != "TIME_WAIT" {
c.activeFlows[flow.CtId] = flow
}
}
c.Unlock()
events, stop, err := conntrack.FollowSize(c.bufferSize, conntrack.NF_NETLINK_CONNTRACK_UPDATE|conntrack.NF_NETLINK_CONNTRACK_DESTROY)
if err != nil {
@@ -128,7 +136,9 @@ func (c *conntrackWalker) run() {
if !ok {
return
}
c.handleFlow(f, false)
if c.relevant(f) {
c.handleFlow(f)
}
}
}
}
@@ -139,18 +149,14 @@ func (c *conntrackWalker) stop() {
close(c.quit)
}
func (c *conntrackWalker) handleFlow(f conntrack.Conn, forceAdd bool) {
func (c *conntrackWalker) handleFlow(f conntrack.Conn) {
c.Lock()
defer c.Unlock()
if c.natOnly && (f.Status&conntrack.IPS_NAT_MASK) == 0 {
return
}
// Ignore flows for which we never saw an update; they are likely
// incomplete or wrong. See #1462.
switch {
case forceAdd || f.MsgType == conntrack.NfctMsgUpdate:
case f.MsgType == conntrack.NfctMsgUpdate:
if f.TCPState != "TIME_WAIT" {
c.activeFlows[f.CtId] = f
} else if _, ok := c.activeFlows[f.CtId]; ok {