aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Moravec <pmoravec@redhat.com>2021-11-09 19:34:25 +0100
committerJake Hunsaker <jhunsake@redhat.com>2021-11-10 15:01:53 -0500
commit38a0533de3dd2613eefcc4865a2916e225e3ceed (patch)
tree2603d7eade33e57b1d7af82914f12220527ef7d1
parent589d47c93257b55bc796ef6ac25b88c974ee3d72 (diff)
downloadsos-38a0533de3dd2613eefcc4865a2916e225e3ceed.tar.gz
[presets] Optimise OCP preset for hundreds of network namespaces
Sos report on OCP having hundreds of namespaces timeouts in networking plugin, as it collects >10 commands for each namespace. Let use a balanced approach in: - increasing network.timeout - limiting namespaces to traverse - disabling ethtool per namespace to ensure sos report successfully finish in a reasonable time, collecting rasonable amount of data. Resolves: #2754 Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
-rw-r--r--sos/presets/redhat/__init__.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/sos/presets/redhat/__init__.py b/sos/presets/redhat/__init__.py
index e6d63611..865c9b6b 100644
--- a/sos/presets/redhat/__init__.py
+++ b/sos/presets/redhat/__init__.py
@@ -29,11 +29,15 @@ RHEL_DESC = RHEL_RELEASE_STR
RHOSP = "rhosp"
RHOSP_DESC = "Red Hat OpenStack Platform"
+RHOSP_OPTS = SoSOptions(plugopts=[
+ 'process.lsof=off',
+ 'networking.ethtool_namespaces=False',
+ 'networking.namespaces=200'])
RHOCP = "ocp"
RHOCP_DESC = "OpenShift Container Platform by Red Hat"
-RHOSP_OPTS = SoSOptions(plugopts=[
- 'process.lsof=off',
+RHOCP_OPTS = SoSOptions(all_logs=True, verify=True, plugopts=[
+ 'networking.timeout=600',
'networking.ethtool_namespaces=False',
'networking.namespaces=200'])
@@ -62,7 +66,7 @@ RHEL_PRESETS = {
RHEL: PresetDefaults(name=RHEL, desc=RHEL_DESC),
RHOSP: PresetDefaults(name=RHOSP, desc=RHOSP_DESC, opts=RHOSP_OPTS),
RHOCP: PresetDefaults(name=RHOCP, desc=RHOCP_DESC, note=NOTE_SIZE_TIME,
- opts=_opts_all_logs_verify),
+ opts=RHOCP_OPTS),
RH_CFME: PresetDefaults(name=RH_CFME, desc=RH_CFME_DESC, note=NOTE_TIME,
opts=_opts_verify),
RH_SATELLITE: PresetDefaults(name=RH_SATELLITE, desc=RH_SATELLITE_DESC,