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