|
 |
ce36b2 |
From 7c8c45dad3481cfaae3d3af9c188218aa14a3a6a Mon Sep 17 00:00:00 2001
|
|
|
ce36b2 |
From: Pavel Moravec <pmoravec@redhat.com>
|
|
|
ce36b2 |
Date: Tue, 9 Apr 2019 09:50:34 +0200
|
|
|
ce36b2 |
Subject: [PATCH] [foreman,satellite] increase plugin default timeouts
|
|
|
ce36b2 |
|
|
|
ce36b2 |
Those two plugins call commands with bigger timeouts than the default
|
|
|
ce36b2 |
plugin timeout is. That can unexpectedly kill the plugin execution when
|
|
|
ce36b2 |
the commands execution took longer than the plugin timeout (but within
|
|
|
ce36b2 |
cmd timeout).
|
|
|
ce36b2 |
|
|
|
ce36b2 |
Resolves: #1642
|
|
|
ce36b2 |
|
|
|
ce36b2 |
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
|
|
ce36b2 |
---
|
|
|
ce36b2 |
sos/plugins/foreman.py | 1 +
|
|
|
ce36b2 |
sos/plugins/satellite.py | 1 +
|
|
|
ce36b2 |
2 files changed, 2 insertions(+)
|
|
|
ce36b2 |
|
|
|
ce36b2 |
diff --git a/sos/plugins/foreman.py b/sos/plugins/foreman.py
|
|
|
ce36b2 |
index a1e937f3..8bcd26bd 100644
|
|
|
ce36b2 |
--- a/sos/plugins/foreman.py
|
|
|
ce36b2 |
+++ b/sos/plugins/foreman.py
|
|
|
ce36b2 |
@@ -19,6 +19,7 @@ class Foreman(Plugin):
|
|
|
ce36b2 |
"""
|
|
|
ce36b2 |
|
|
|
ce36b2 |
plugin_name = 'foreman'
|
|
|
ce36b2 |
+ plugin_timeout = 1800
|
|
|
ce36b2 |
profiles = ('sysmgmt',)
|
|
|
ce36b2 |
packages = ('foreman', 'foreman-proxy')
|
|
|
ce36b2 |
option_list = [
|
|
|
ce36b2 |
diff --git a/sos/plugins/satellite.py b/sos/plugins/satellite.py
|
|
|
ce36b2 |
index c50c2ec7..83733076 100644
|
|
|
ce36b2 |
--- a/sos/plugins/satellite.py
|
|
|
ce36b2 |
+++ b/sos/plugins/satellite.py
|
|
|
ce36b2 |
@@ -14,6 +14,7 @@ class Satellite(Plugin, RedHatPlugin):
|
|
|
ce36b2 |
"""
|
|
|
ce36b2 |
|
|
|
ce36b2 |
plugin_name = 'satellite'
|
|
|
ce36b2 |
+ plugin_timeout = 1200
|
|
|
ce36b2 |
profiles = ('sysmgmt',)
|
|
|
ce36b2 |
verify_packages = ('spacewalk.*',)
|
|
|
ce36b2 |
satellite = False
|
|
|
ce36b2 |
--
|
|
|
ce36b2 |
2.17.2
|
|
|
ce36b2 |
|