ft-orchestration add rss-queues to yaf pcap

Author: pascal260303

tools/ft-orchestration/src/probe/ipfixprobe.py

@@ -178,7 +178,7 @@ class IpfixprobeRawSettings(IpfixprobeSettings):
     queues_count: int = 1
 
     # For interface setup defaults to number of cpus
-    rss_queues: int = 0
+    rss_queues: int = 1
 
     def __post_init__(self):
         assert len(self.interfaces) > 0
@@ -205,7 +205,7 @@ class IpfixprobePcapSettings(IpfixprobeSettings):
     snaplen: Optional[int] = None
 
     # For interface setup defaults to number of cpus
-    rss_queues: int = 0
+    rss_queues: int = 1
 
     def __post_init__(self):
         assert len(self.interfaces) > 0
@@ -812,8 +812,6 @@ def __init__(
         super().__init__(
             executor, target, protocols, interfaces, verbose, self._settings, sudo
         )
-        if self._settings.rss_queues == 0:
-            self._settings.rss_queues = self.host_statistics.cpus
         self._mtu = mtu
 
     def _prepare_cmd(
@@ -882,8 +880,6 @@ def __init__(
         super().__init__(
             executor, target, protocols, interfaces, verbose, self._settings, sudo
         )
-        if self._settings.rss_queues == 0:
-            self._settings.rss_queues = self.host_statistics.cpus
         self._mtu = mtu
 
     def _prepare_cmd(

tools/ft-orchestration/src/probe/yaf.py

@@ -182,6 +182,7 @@ def __init__(
         sudo: bool = False,
         inactive_timeout: int = 50,
         cache_size=None,
+        rss_queues: int = 1,
         **kwargs: dict,
     ):
         if len(interfaces) > 1:
@@ -246,6 +247,7 @@ def __init__(
         self._cmd = None
         self.host_statistics = MpStat(stats_executor, "yaf")
         self._rsync = Rsync(executor)
+        self._rss_queues_pcap = rss_queues
 
     def _write_config(self, settings: YafSettings):
         def to_lua_literal(value) -> str:
@@ -309,6 +311,11 @@ def _before_start(self):
                 executor=self._executor,
                 sudo=self._sudo,
             ).run()
+            Tool(
+                f"ethtool --set-channels {self._settings.input.inf} combined {self._rss_queues_pcap}",
+                executor=self._executor,
+                sudo=self._sudo,
+            ).run()
 
     def start(self, start_stats: bool = True, stop_running: bool = True):
         """