Blame SOURCES/sos-bz1928650-powerpc-nhv-scsi-logs.patch

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