From fac57721ae10dafec909c4fac408f42ebe23d4ac Mon Sep 17 00:00:00 2001
From: "Bryn M. Reeves" <bmr@redhat.com>
Date: Mon, 26 Jan 2015 16:14:01 -0500
Subject: [firewalld] work around command hangs in container environments

Add a 10s timeout to firewalld-cmd execution to avoid long dbus
timeouts in docker containers.

Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
---
 sos/plugins/firewalld.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sos/plugins/firewalld.py b/sos/plugins/firewalld.py
index 98d011b2..8eeb2b65 100644
--- a/sos/plugins/firewalld.py
+++ b/sos/plugins/firewalld.py
@@ -35,9 +35,11 @@ class FirewallD(Plugin, RedHatPlugin):
             "/etc/sysconfig/firewalld"
         ])
 
+        # use a 10s timeout to workaround dbus problems in
+        # docker containers.
         self.add_cmd_output([
             "firewall-cmd --list-all-zones",
             "firewall-cmd --permanent --list-all-zones"
-        ])
+        ], timeout=10)
 
 # vim: set et ts=4 sw=4 :
-- 
cgit