commit 36140249bcab17d1a3a69467208ca25af85a75f1 Author: Bryn M. Reeves Date: Wed Aug 14 15:59:45 2013 +0100 Do not attempt to read use-gss-proxy file in procfs The networking plug-in scoops up /proc/net. There are some pseudo- files in here that we should avoid touching. These either have side-effects or hang the reading process. Add a forbidden path for the /proc/net/rpc/*/{channel,flush} files as these will cause side-effects for RPC applications running on the host. Forward port of commit 61585d4 on rhel-6 branch. Signed-off-by: Bryn M. Reeves Conflicts: sos/plugins/networking.py diff --git a/sos/plugins/networking.py b/sos/plugins/networking.py index 90b740c..90e1b58 100644 --- a/sos/plugins/networking.py +++ b/sos/plugins/networking.py @@ -80,6 +80,9 @@ class Networking(Plugin): "/etc/NetworkManager/NetworkManager.conf", "/etc/NetworkManager/system-connections", "/etc/dnsmasq*"]) + self.add_forbidden_path("/proc/net/rpc/use-gss-proxy") + self.add_forbidden_path("/proc/net/rpc/*/channel") + self.add_forbidden_path("/proc/net/rpc/*/flush") ip_addr_file=self.get_cmd_output_now("ip -o addr", root_symlink = "ip_addr") ip_addr_out=self.call_ext_prog("ip -o addr")