diff --git a/SOURCES/sos-bz1869724-ethtool-not-on-bnx2x.patch b/SOURCES/sos-bz1869724-ethtool-not-on-bnx2x.patch new file mode 100644 index 0000000..aa25084 --- /dev/null +++ b/SOURCES/sos-bz1869724-ethtool-not-on-bnx2x.patch @@ -0,0 +1,47 @@ +From 34c77d6902ee1df403dc3836b4092d413fb95350 Mon Sep 17 00:00:00 2001 +From: suresh2514 +Date: Fri, 14 Aug 2020 22:59:34 +0530 +Subject: [PATCH] [networking] remove 'ethtool -e' option for bnx2x NICs + +Running EEPROM dump (ethtool -e) can result in bnx2x driver NICs to +pause for few seconds and is not recommended in production environment. + +Resolves: #2188 +Resolves: #2200 + +Signed-off-by: suresh2514 +Signed-off-by: Jake Hunsaker +--- + sos/plugins/networking.py | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py +index ba9c0fb11..397549a56 100644 +--- a/sos/plugins/networking.py ++++ b/sos/plugins/networking.py +@@ -182,7 +182,6 @@ def setup(self): + "ethtool -a " + eth, + "ethtool -c " + eth, + "ethtool -g " + eth, +- "ethtool -e " + eth, + "ethtool -P " + eth, + "ethtool -l " + eth, + "ethtool --phy-statistics " + eth, +@@ -189,6 +189,17 @@ class Networking(Plugin): + "ethtool --show-eee " + eth + ]) + ++ # skip EEPROM collection for 'bnx2x' NICs as this command ++ # can pause the NIC and is not production safe. ++ bnx_output = { ++ "cmd": "ethtool -i %s" % eth, ++ "output": "bnx2x" ++ } ++ bnx_pred = SoSPredicate(self, ++ cmd_outputs=bnx_output, ++ required={'cmd_outputs': 'none'}) ++ self.add_cmd_output("ethtool -e %s" % eth, pred=bnx_pred) ++ + # Collect information about bridges (some data already collected via + # "ip .." commands) + self.add_cmd_output([ diff --git a/SPECS/sos.spec b/SPECS/sos.spec index cffff05..3e43267 100644 --- a/SPECS/sos.spec +++ b/SPECS/sos.spec @@ -5,7 +5,7 @@ Summary: A set of tools to gather troubleshooting information from a system Name: sos Version: 3.9.1 -Release: 5%{?dist} +Release: 6%{?dist} Group: Applications/System Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz Source1: sos-audit-%{auditversion}.tgz @@ -39,6 +39,7 @@ Patch16: sos-bz1851923-powerpc-missing-logs.patch Patch17: sos-bz1853700-pci-too-strong-condition.patch Patch18: sos-bz1857590-gluster-removes-sockfiles.patch Patch19: sos-bz1859888-kubernetes-indexerror-on-nodes.patch +Patch20: sos-bz1869724-ethtool-not-on-bnx2x.patch %description Sos is a set of tools that gathers information about system @@ -67,6 +68,7 @@ support technicians and developers. %patch17 -p1 %patch18 -p1 %patch19 -p1 +%patch20 -p1 %setup -T -D -a1 -q %build @@ -119,6 +121,10 @@ of the system. Currently storage and filesystem commands are audited. %ghost /etc/audit/rules.d/40-sos-storage.rules %changelog +* Wed Aug 19 2020 Pavel Moravec = 3.9.1-6 +- [networking] remove 'ethtool -e' option for bnx2x NICs + Resolves: bz1869724 + * Fri Jul 24 2020 Pavel Moravec = 3.9.1-5 - [logs] collect also non-persistent journal logs Resolves: bz1850926