diff options
| author | Pavel Moravec <pmoravec@redhat.com> | 2018-05-18 12:59:31 +0200 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2018-05-24 15:30:51 +0100 |
| commit | 5528ccbc2d5b45c88a979d2b14115de0905e2e83 (patch) | |
| tree | aed483e10181892b122ba7b0068165e4a7bd8c1b | |
| parent | 29201835c256646569b6e703aed5d4e345b00507 (diff) | |
| download | sos-5528ccbc2d5b45c88a979d2b14115de0905e2e83.tar.gz | |
[system,kernel] dont collect some empty nonreadable files
To prevent confusing errors on stdout in py3
Relevant to: #1299
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
| -rw-r--r-- | sos/plugins/kernel.py | 6 | ||||
| -rw-r--r-- | sos/plugins/system.py | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py index 39874ad0..8e9238cf 100644 --- a/sos/plugins/kernel.py +++ b/sos/plugins/kernel.py @@ -80,12 +80,16 @@ class Kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): clocksource_path = "/sys/devices/system/clocksource/clocksource0/" + # FIXME: provide a a long-term solution for #1299 self.add_forbidden_path([ '/sys/kernel/debug/tracing/trace_pipe', '/sys/kernel/debug/tracing/README', '/sys/kernel/debug/tracing/trace_stat/*', '/sys/kernel/debug/tracing/per_cpu/*', - '/sys/kernel/debug/tracing/events/*' + '/sys/kernel/debug/tracing/events/*', + '/sys/kernel/debug/tracing/free_buffer', + '/sys/kernel/debug/tracing/trace_marker', + '/sys/kernel/debug/tracing/trace_marker_raw' ]) self.add_copy_spec([ diff --git a/sos/plugins/system.py b/sos/plugins/system.py index a8e3d129..de3dd59b 100644 --- a/sos/plugins/system.py +++ b/sos/plugins/system.py @@ -24,7 +24,10 @@ class System(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/etc/default", ]) + # FIXME: provide a a long-term solution for #1299 self.add_forbidden_path([ + "/proc/sys/net/ipv4/route/flush", + "/proc/sys/net/ipv6/route/flush", "/proc/sys/net/ipv6/neigh/*/retrans_time", "/proc/sys/net/ipv6/neigh/*/base_reachable_time" ]) |