Merge branch 'main' into add_BPF_F_NO_PREALLOC_option

deepflowio · Sep 29, 2024 · 6cf1812 · 6cf1812
2 parents 1db681e + 79deb8f
commit 6cf1812
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/agent/src/config/config.rs b/agent/src/config/config.rs
@@ -3644,13 +3644,13 @@ impl YamlConfig {
  if c.ebpf.ring_size < 8192 || c.ebpf.ring_size > 131072 {
  c.ebpf.ring_size = 65536;
  }
- if c.ebpf.max_socket_entries < 100000 || c.ebpf.max_socket_entries > 2000000 {
+ if c.ebpf.max_socket_entries < 10000 || c.ebpf.max_socket_entries > 2000000 {
  c.ebpf.max_socket_entries = 131072;
  }
- if c.ebpf.socket_map_max_reclaim < 100000 || c.ebpf.socket_map_max_reclaim > 2000000 {
+ if c.ebpf.socket_map_max_reclaim < 8000 || c.ebpf.socket_map_max_reclaim > 2000000 {
  c.ebpf.socket_map_max_reclaim = 120000;
  }
- if c.ebpf.max_trace_entries < 100000 || c.ebpf.max_trace_entries > 2000000 {
+ if c.ebpf.max_trace_entries < 10000 || c.ebpf.max_trace_entries > 2000000 {
  c.ebpf.max_trace_entries = 131072;
  }
  if c.ebpf.java_symbol_file_refresh_defer_interval < Duration::from_secs(5)

diff --git a/server/agent_config/example.yaml b/server/agent_config/example.yaml
@@ -1412,17 +1412,17 @@ static_config:
  ring-size: 65536
 
  # eBPF max socket entries
- # Default: 131072. Range: [100000, 2000000]
+ # Default: 131072. Range: [10000, 2000000]
  # Note: Set the maximum value of hash table entries for socket tracking, depending on the number of concurrent requests in the actual scenario
  max-socket-entries: 131072
 
  # eBPF socket map max reclaim
- # Default: 120000. Range: [100000, 2000000]
+ # Default: 120000. Range: [8000, 2000000]
  # Note: The maximum threshold for cleaning socket map table entries.
  socket-map-max-reclaim: 120000
 
  # eBPF max trace entries
- # Default: 131072. Range: [100000, 2000000]
+ # Default: 131072. Range: [10000, 2000000]
  # Note: Set the maximum value of hash table entries for thread/coroutine tracking sessions.
  max-trace-entries: 131072
 

diff --git a/server/agent_config/template.yaml b/server/agent_config/template.yaml
@@ -2865,7 +2865,7 @@ inputs:
  # en: Maximum Socket Entries
  # ch: 最大 Socket 条目数
  # unit:
- # range: [100000, 2000000]
+ # range: [10000, 2000000]
  # enum_options: []
  # modification: agent_restart
  # ee_feature: false
@@ -2883,7 +2883,7 @@ inputs:
  # en: Socket Map Reclaim Threshold
  # ch: Socket Map 回收阈值
  # unit:
- # range: [100000, 2000000]
+ # range: [8000, 2000000]
  # enum_options: []
  # modification: agent_restart
  # ee_feature: false
@@ -2900,7 +2900,7 @@ inputs:
  # en: Maximum Trace Entries
  # ch: 最大 Trace 条目数
  # unit:
- # range: [100000, 2000000]
+ # range: [10000, 2000000]
  # enum_options: []
  # modification: agent_restart
  # ee_feature: false