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

Don't every store NEW conntrack flows (only every store updates). (#1541)

Browse Source 
This closes a small window where we might produce reports which contain flows that are NEW but have never seen an UPDATE, which can potentially be invalid.
This commit is contained in:
Tom Wilkie
2016-05-27 11:25:42 +01:00
parent 7377945302
commit 277bd70491
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
probe/endpoint/conntrack.go
View File

@@ -305,8 +305,10 @@ func (c *conntrackWalker) handleFlow(f flow, forceAdd bool) {
c.Lock()
defer c.Unlock()
// Ignore flows for which we never saw an update; they are likely
// incomplete or wrong. See #1462.
switch {
case forceAdd || f.Type == newType || f.Type == updateType:
case forceAdd || f.Type == updateType:
if f.Independent.State != timeWait {
c.activeFlows[f.Independent.ID] = f
} else if _, ok := c.activeFlows[f.Independent.ID]; ok {
@@ -316,11 +318,7 @@ func (c *conntrackWalker) handleFlow(f flow, forceAdd bool) {
case f.Type == destroyType:
if active, ok := c.activeFlows[f.Independent.ID]; ok {
delete(c.activeFlows, f.Independent.ID)
// Ignore flows for which we never saw an update; they are likely
// incomplete or wrong. See #1462.
if active.Type == updateType {
c.bufferedFlows = append(c.bufferedFlows, active)
}
c.bufferedFlows = append(c.bufferedFlows, active)
}
}
}