diff options
| author | Jake Hunsaker <jhunsake@redhat.com> | 2020-01-28 15:22:51 -0500 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2020-02-04 12:59:09 -0500 |
| commit | dd9c27b938e53f3962940472fffc4aa8350d9943 (patch) | |
| tree | dc8ba4a2657c3a165ef9926e4b9981ddc95ce4cf | |
| parent | 1070f6ed363df51c860e3c15a3e32c3f1adf4292 (diff) | |
| download | sos-dd9c27b938e53f3962940472fffc4aa8350d9943.tar.gz | |
[s390] Correctly capture s390dbf
Captures the content under /sys/kernel/debug/s390dbf rather than just
listing the file names.
Also included are trivial stylistic fixes.
Closes: #905
Resolves: #1926
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
| -rw-r--r-- | sos/plugins/s390.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sos/plugins/s390.py b/sos/plugins/s390.py index 19eb4911..8cb98f81 100644 --- a/sos/plugins/s390.py +++ b/sos/plugins/s390.py @@ -41,17 +41,22 @@ class S390(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "/sys/bus/ccw/drivers/zfcp/0.*/*", "/sys/bus/ccw/drivers/zfcp/0.*/0x*/*", "/sys/bus/ccw/drivers/zfcp/0.*/0x*/0x*/*", + "/sys/kernel/debug/s390dbf", "/etc/zipl.conf", "/etc/zfcp.conf", "/etc/sysconfig/dumpconf", "/etc/src_vipa.conf", "/etc/ccwgroup.conf", - "/etc/chandev.conf"]) + "/etc/chandev.conf" + ]) + + # skip flush as it is useless for sos collection + self.add_forbidden_path("/sys/kernel/debug/s390dbf/*/flush") + self.add_cmd_output([ "lscss", "lsdasd", "lstape", - "find /proc/s390dbf -type f", "qethconf list_all", "lsqeth", "lszfcp", @@ -59,6 +64,7 @@ class S390(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "icainfo", "icastats" ]) + r = self.exec_cmd("ls /dev/dasd?") dasd_dev = r['output'] for x in dasd_dev.split('\n'): |