From 47ef7ba5395d4bc6553f60a94a79e68bb4ce8201 Mon Sep 17 00:00:00 2001 From: "Bryn M. Reeves" Date: Thu, 31 Jul 2014 13:09:02 +0100 Subject: [rpm] reduce verify timeout to 180s The initial rpm verify timeout was set to 3600s (one hour). This is insane; if a verify has not completed in that time then it's unlikely that it ever will. With the current set of verify patterns the total time taken in rpm (including both the verify and all other runs, e.g. policy initialisation) is under 60s on all my test hosts (bare metal and virtual). Allow a factor of three over this figure and set the timeout to 180s. Signed-off-by: Bryn M. Reeves --- sos/plugins/rpm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sos/plugins/rpm.py b/sos/plugins/rpm.py index 1177c187..78bbad44 100644 --- a/sos/plugins/rpm.py +++ b/sos/plugins/rpm.py @@ -44,7 +44,7 @@ class Rpm(Plugin, RedHatPlugin): if self.get_option("verify"): if self.get_option("rpmva"): - self.add_cmd_output("rpm -Va", root_symlink = "rpm-Va", timeout = 3600) + self.add_cmd_output("rpm -Va", root_symlink="rpm-Va", timeout=180) else: pkgs_by_regex = self.policy().package_manager.all_pkgs_by_name_regex verify_list = map(pkgs_by_regex, self.verify_list) -- cgit