rpms/sos
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import sos-3.9.1-7.el8_3

Browse Source
This commit is contained in:
CentOS Sources 2021-04-06 09:35:36 -04:00 committed by Andrew Lukoshko
parent 7465d6d401
commit 6af2bdc397
2 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
SOURCES/sos-bz1928627-networking-ethtool-e-conditionally.patch Normal file
View File

@ -0,0 +1,60 @@
From aca8bd83117e177f2beac6b9434d36d446a7de64 Mon Sep 17 00:00:00 2001
From: Pavel Moravec <pmoravec@redhat.com>
Date: Mon, 18 Jan 2021 22:45:43 +0100
Subject: [PATCH] [networking] Collect 'ethtool -e <device>' conditionally only
EEPROM dump collection might hang on specific types of devices, or
negatively impact the system otherwise. As a safe option, sos report
should collect the command when explicitly asked via a plugopt only.
Resolves: #2376
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
---
sos/plugins/networking.py | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py
index e4236ed9..5bdb697e 100644
--- a/sos/plugins/networking.py
+++ b/sos/plugins/networking.py
@@ -27,7 +27,8 @@ class Networking(Plugin):
("namespaces", "Number of namespaces to collect, 0 for unlimited. " +
"Incompatible with the namespace_pattern plugin option", "slow", 0),
("ethtool_namespaces", "Define if ethtool commands should be " +
- "collected for namespaces", "slow", True)
+ "collected for namespaces", "slow", True),
+ ("eepromdump", "collect 'ethtool -e' for all devices", "slow", False)
]
# switch to enable netstat "wide" (non-truncated) output mode
@@ -141,16 +142,15 @@ 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)
+ # skip EEPROM collection by default, as it might hang or
+ # negatively impact the system on some device types
+ if self.get_option("eepromdump"):
+ cmd = "ethtool -e %s" % eth
+ self._log_warn("WARNING (about to collect '%s'): collecting "
+ "an eeprom dump is known to cause certain NIC "
+ "drivers (e.g. bnx2x/tg3) to interrupt device "
+ "operation" % cmd)
+ self.add_cmd_output(cmd)
# Collect information about bridges (some data already collected via
# "ip .." commands)
--
2.26.2

8
SPECS/sos.spec
View File

@ -5,7 +5,7 @@
Summary: A set of tools to gather troubleshooting information from a system
Name: sos
Version: 3.9.1
Release: 6%{?dist}
Release: 7%{?dist}
Group: Applications/System
Source0: https://github.com/sosreport/sos/archive/%{version}/sos-%{version}.tar.gz
Source1: sos-audit-%{auditversion}.tgz
@ -40,6 +40,7 @@ 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
Patch21: sos-bz1928627-networking-ethtool-e-conditionally.patch
%description
Sos is a set of tools that gathers information about system
@ -69,6 +70,7 @@ support technicians and developers.
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
%setup -T -D -a1 -q
%build
@ -121,6 +123,10 @@ of the system. Currently storage and filesystem commands are audited.
%ghost /etc/audit/rules.d/40-sos-storage.rules
%changelog
* Mon Feb 15 2021 Pavel Moravec <pmoravec@redhat.com> = 3.9.1-7
- [networking] Collect 'ethtool -e <device>' conditionally only
Resolves: bz1928627
* Wed Aug 19 2020 Pavel Moravec <pmoravec@redhat.com> = 3.9.1-6
- [networking] remove 'ethtool -e' option for bnx2x NICs
Resolves: bz1869724