diff options
| author | Jake Hunsaker <jhunsake@redhat.com> | 2019-06-21 10:21:22 -0400 |
|---|---|---|
| committer | Pavel Moravec <pmoravec@redhat.com> | 2019-08-25 11:32:23 +0200 |
| commit | a5edbabc4ef815fb9c55c90798ceddf2f121aacd (patch) | |
| tree | a2cb09282e18048f29a6ef6b7510f49ae81f99f7 | |
| parent | 058c2178ecfac860e63b818db39930dc77eb469b (diff) | |
| download | sos-a5edbabc4ef815fb9c55c90798ceddf2f121aacd.tar.gz | |
[crio] Write outputs to subdir, fix possible exception in output parsing
Updates the plugin to write container/image/pod output from crictl to
subdirs.
Additionally, fixes an issue where an exception could be raised when a
crictl command has no output at all.
Resolves: #1706
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
| -rw-r--r-- | sos/plugins/crio.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sos/plugins/crio.py b/sos/plugins/crio.py index 8a469008..94f57030 100644 --- a/sos/plugins/crio.py +++ b/sos/plugins/crio.py @@ -73,13 +73,14 @@ class CRIO(Plugin, RedHatPlugin, UbuntuPlugin): for container in containers: self.add_cmd_output("crictl inspect %s" % container) if self.get_option('logs'): - self.add_cmd_output("crictl logs -t %s" % container) + self.add_cmd_output("crictl logs -t %s" % container, + subdir="containers") for image in images: - self.add_cmd_output("crictl inspecti %s" % image) + self.add_cmd_output("crictl inspecti %s" % image, subdir="images") for pod in pods: - self.add_cmd_output("crictl inspectp %s" % pod) + self.add_cmd_output("crictl inspectp %s" % pod, subdir="pods") def _get_crio_list(self, cmd): ret = [] @@ -88,7 +89,7 @@ class CRIO(Plugin, RedHatPlugin, UbuntuPlugin): for ent in result['output'].splitlines(): ret.append(ent) # Prevent the socket deprecation warning from being iterated over - if 'deprecated' in ret[0]: + if ret and 'deprecated' in ret[0]: ret.pop(0) return ret |