diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2013-07-30 17:42:40 +0100 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2013-07-30 17:42:40 +0100 |
| commit | 70997bc11f3d07ba206569721a3fe79d3af942f6 (patch) | |
| tree | e275b167d1460d2fc69dac2d532090f1f1f323e1 | |
| parent | 53f4f0311ed22ca83c547c0df89915d38e8ae27e (diff) | |
| download | sos-70997bc11f3d07ba206569721a3fe79d3af942f6.tar.gz | |
Restrict wbinfo collection to the current domain.
The samba module calls the wbinfo command to collect user and
group information. This by default will search all domains to
which the host has access. In a large AD environment with a number
of trusted domains this causes the winbindd process to consume
excessive CPU and memory resources.
The Samba developers have commented that fixing this would require
a complete rewrite of the winbind protocol and wbinfo client.
Since listing out the _entire_ set of visible users is unlikely
to be of any use anyway pass the --domain='.' option to restrict
the search to the current domain of the system.
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/samba.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sos/plugins/samba.py b/sos/plugins/samba.py index d4e2fe82..f3a44b77 100644 --- a/sos/plugins/samba.py +++ b/sos/plugins/samba.py @@ -23,8 +23,8 @@ class Samba(Plugin): self.add_copy_specs([ "/etc/samba", "/var/log/samba/*",]) - self.add_cmd_output("wbinfo -g") - self.add_cmd_output("wbinfo -u") + self.add_cmd_output("wbinfo --domain='.' -g") + self.add_cmd_output("wbinfo --domain='.' -u") self.add_cmd_output("testparm -s -v") |