Simplify connection tracker init and fix procfs scan fallback #2539
Conversation
|
LGTM (on green). Much easier to read. Thanks |
|
ouch @2opremio, I think I found a bug... I am pretty sure in 7497c7d you should also have changed https://github.com/weaveworks/scope/blob/master/probe/endpoint/connection_tracker.go#L100 And guess what, I picked the wrong version in this PR. Will get that fixed. Is that worthy of a 1.4.x release? Perhaps not since ebpf is not enabled by default, so the above code won't be exercised in most installs. |
rade
force-pushed
the
simplify-connection-tracker-init
branch
from
8c4b749 to
80a7ceb
Compare
- eliminate the code duplication when falling back to procfs scanning - trim some superfluous comments Also fix a bug in the procvess: when falling back to procfs scanning in ReportConnections, the scanner was given a "--any-nat" param, which is wrong.
we now do correctly fall back to proc scanning when eBPF fails
we always have a flowWalker when not using ebpf
rade
force-pushed
the
simplify-connection-tracker-init
branch
from
80a7ceb to
b52b207
Compare
rade
changed the title
rade
changed the title
rade
changed the title
|
Good catch!
I agree, it only happens when explicitly enabling ebpf and when it fails. Coincidentaly I was thinking about how to force this situation in an integration test for #2535 |
No description provided.