102 lines
3.5 KiB
Diff
102 lines
3.5 KiB
Diff
From 271c35b9be95cf4957150fd702823fbb46ddaa6b Mon Sep 17 00:00:00 2001
|
|
From: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
|
|
Date: Tue, 19 Jan 2021 19:54:26 +0530
|
|
Subject: [PATCH 1/2] [powerpc]:Add support to collect HNV infomation
|
|
|
|
This patch is to update powerpc plugin to collect
|
|
Hyper-V Network Virtualization information.
|
|
|
|
/var/log/hcnmgr -- hybridnetwork debugging messages. Must collect
|
|
/var/ct/IBM.DRM.stderr -- DynamicRM log messages
|
|
/var/ct/IW/log/mc/IBM.DRM/trace* -- IBM DRM traces
|
|
lsdevinfo
|
|
ournalctl
|
|
|
|
Signed-off-by: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
|
|
---
|
|
sos/report/plugins/kernel.py | 1 -
|
|
sos/report/plugins/powerpc.py | 9 +++++++--
|
|
2 files changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/sos/report/plugins/kernel.py b/sos/report/plugins/kernel.py
|
|
index 27e0e4d00..febe2ad0a 100644
|
|
--- a/sos/report/plugins/kernel.py
|
|
+++ b/sos/report/plugins/kernel.py
|
|
@@ -106,7 +106,6 @@ def setup(self):
|
|
"/proc/misc",
|
|
"/var/log/dmesg",
|
|
"/sys/fs/pstore",
|
|
- "/var/log/hcnmgr",
|
|
clocksource_path + "available_clocksource",
|
|
clocksource_path + "current_clocksource"
|
|
])
|
|
diff --git a/sos/report/plugins/powerpc.py b/sos/report/plugins/powerpc.py
|
|
index d29eb0a63..c63551cad 100644
|
|
--- a/sos/report/plugins/powerpc.py
|
|
+++ b/sos/report/plugins/powerpc.py
|
|
@@ -63,7 +63,10 @@ def setup(self):
|
|
"/proc/ppc64/systemcfg",
|
|
"/var/log/platform",
|
|
"/var/log/drmgr",
|
|
- "/var/log/drmgr.0"
|
|
+ "/var/log/drmgr.0",
|
|
+ "/var/log/hcnmgr",
|
|
+ "/var/ct/IBM.DRM.stderr",
|
|
+ "/var/ct/IW/log/mc/IBM.DRM/trace*"
|
|
])
|
|
ctsnap_path = self.get_cmd_output_path(name="ctsnap", make=True)
|
|
self.add_cmd_output([
|
|
@@ -74,8 +77,10 @@ def setup(self):
|
|
"serv_config -l",
|
|
"bootlist -m both -r",
|
|
"lparstat -i",
|
|
- "ctsnap -xrunrpttr -d %s" % (ctsnap_path)
|
|
+ "ctsnap -xrunrpttr -d %s" % (ctsnap_path),
|
|
+ "lsdevinfo"
|
|
])
|
|
+ self.add_service_status("hcn-init")
|
|
|
|
if isPowerNV:
|
|
self.add_copy_spec([
|
|
|
|
From 692eba8eeec6254bdb356a6bfdc8cfa1f77bfbbc Mon Sep 17 00:00:00 2001
|
|
From: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
|
|
Date: Tue, 19 Jan 2021 19:58:53 +0530
|
|
Subject: [PATCH 2/2] [scsi]:Add support to collect SCSI debugging logs
|
|
|
|
This patch updates scsi plugin to collect
|
|
additional logs for SCSI devices
|
|
|
|
Signed-off-by: Mamatha Inamdar <mamatha4@linux.vnet.ibm.com>
|
|
---
|
|
sos/report/plugins/scsi.py | 16 ++++++++++++----
|
|
1 file changed, 12 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/sos/report/plugins/scsi.py b/sos/report/plugins/scsi.py
|
|
index 50cfca0f7..28d1396c6 100644
|
|
--- a/sos/report/plugins/scsi.py
|
|
+++ b/sos/report/plugins/scsi.py
|
|
@@ -29,10 +29,18 @@ def setup(self):
|
|
])
|
|
|
|
self.add_cmd_output("lsscsi -i", suggest_filename="lsscsi")
|
|
- self.add_cmd_output("sg_map -x")
|
|
- self.add_cmd_output("lspath")
|
|
- self.add_cmd_output("lsmap -all")
|
|
- self.add_cmd_output("lsnports")
|
|
+
|
|
+ self.add_cmd_output([
|
|
+ "sg_map -x",
|
|
+ "lspath",
|
|
+ "lsmap -all",
|
|
+ "lsnports",
|
|
+ "lsscsi -H",
|
|
+ "lsscsi -g",
|
|
+ "lsscsi -d",
|
|
+ "lsscsi -s",
|
|
+ "lsscsi -L"
|
|
+ ])
|
|
|
|
scsi_hosts = glob("/sys/class/scsi_host/*")
|
|
self.add_blockdev_cmd("udevadm info -a %(dev)s", devices=scsi_hosts,
|