Blame SOURCES/sos-bz1690999-docker-skip-system-df.patch

cbe53b
From 372e9389e83befbb9d48ae9bebd83c7dde87d95c Mon Sep 17 00:00:00 2001
cbe53b
From: Jake Hunsaker <jhunsake@redhat.com>
cbe53b
Date: Wed, 20 Mar 2019 14:48:21 +0000
cbe53b
Subject: [PATCH] [docker] do not collect 'system df' by default
cbe53b
cbe53b
Gates collection of 'docker system df' behind the docker.size option
cbe53b
as this command can take a long time to run just like 'ps -as'.
cbe53b
cbe53b
Related: #1580
cbe53b
cbe53b
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
cbe53b
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
cbe53b
---
cbe53b
 sos/plugins/docker.py | 4 ++--
cbe53b
 1 file changed, 2 insertions(+), 2 deletions(-)
cbe53b
cbe53b
diff --git a/sos/plugins/docker.py b/sos/plugins/docker.py
cbe53b
index d8c854f9..80c4946f 100644
cbe53b
--- a/sos/plugins/docker.py
cbe53b
+++ b/sos/plugins/docker.py
cbe53b
@@ -49,7 +49,6 @@ class Docker(Plugin):
cbe53b
             'ps',
cbe53b
             'ps -a',
cbe53b
             'stats --no-stream',
cbe53b
-            'system df',
cbe53b
             'version',
cbe53b
             'volume ls'
cbe53b
         ]
cbe53b
@@ -48,9 +48,10 @@ class Docker(Plugin):
cbe53b
         for subcmd in subcmds:
cbe53b
             self.add_cmd_output("docker %s" % subcmd)
cbe53b
 
cbe53b
-        # separately grab ps -s as this can take a *very* long time
cbe53b
+        # separately grab these separately as they can take a *very* long time
cbe53b
         if self.get_option('size'):
cbe53b
             self.add_cmd_output('docker ps -as')
cbe53b
+            self.add_cmd_output('docker system df')
cbe53b
 
cbe53b
         self.add_journal(units="docker")
cbe53b
         self.add_cmd_output("ls -alhR /etc/docker")
cbe53b
-- 
cbe53b
2.17.2
cbe53b