From ca5b9445508a8befa8fe65eefd8f29d460733f79 Mon Sep 17 00:00:00 2001
From: "Mohamed S. Mahmoud" <mmahmoud@redhat.com>
Date: Thu, 16 Jan 2025 06:46:00 -0500
Subject: [PATCH] Always set the additional map size (#510)
additional map include interfaces list the packets
go through regardless if agent features are
enabled or not
Signed-off-by: Mohamed Mahmoud <mmahmoud@redhat.com>
---
pkg/tracer/tracer.go | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/pkg/tracer/tracer.go b/pkg/tracer/tracer.go
index b8b2be6d..75912c83 100644
--- a/pkg/tracer/tracer.go
+++ b/pkg/tracer/tracer.go
@@ -132,11 +132,8 @@ func NewFlowFetcher(cfg *FlowFetcherConfig) (*FlowFetcher, error) {
// Resize maps according to user-provided configuration
spec.Maps[aggregatedFlowsMap].MaxEntries = uint32(cfg.CacheMaxSize)
- if isEBPFFeaturesEnabled(cfg) {
- spec.Maps[additionalFlowMetrics].MaxEntries = uint32(cfg.CacheMaxSize)
- } else {
- spec.Maps[additionalFlowMetrics].MaxEntries = 1
- }
+ spec.Maps[additionalFlowMetrics].MaxEntries = uint32(cfg.CacheMaxSize)
+
// remove pinning from all maps
maps2Name := []string{"aggregated_flows", "additional_flow_metrics", "direct_flows", "dns_flows", "filter_map", "global_counters", "packet_record"}
for _, m := range maps2Name {
@@ -368,13 +365,6 @@ func NewFlowFetcher(cfg *FlowFetcherConfig) (*FlowFetcher, error) {
}, nil
}
-func isEBPFFeaturesEnabled(cfg *FlowFetcherConfig) bool {
- if cfg.EnableNetworkEventsMonitoring || cfg.EnableRTT || cfg.EnablePktDrops || cfg.EnableDNSTracker || cfg.EnablePktTranslation {
- return true
- }
- return false
-}
-
func (m *FlowFetcher) AttachTCX(iface ifaces.Interface) error {
ilog := log.WithField("iface", iface)
if iface.NetNS != netns.None() {
--
GitLab