File s390-tools-sles15sp3-05-dbginfo.sh-reorder-collection-steps.patch of Package s390-tools.25302

Subject: [PATCH] [BZ 195579] dbginfo.sh: update the order of collection steps
From: Joern Siglen <siglen@de.ibm.com>

Description:   dbginfo.sh: stabilzation of data collection
Symptom:       o script hangup possible on single commands
               o missing data collection on error
               o overwrite of buffers by diag commands
Problem:       hangup and lost of data collection
Solution:      rework code regarding 
                o add timeout function
                o remove probelmatic commands
                o include handling improvements         
Reproduction:  -
Upstream-ID:   38343be0fad04801383d3e130a31e257d429185c
Problem-ID:    195579

Upstream-Description:

              dbginfo.sh: update the order of collection steps

              We found situations, where the debug commands from dbginfo.sh
              did overwrite some debug files (e.g. OSA s390dbf) - so we change
              the collection order

              Signed-off-by: Joern Siglen <siglen@de.ibm.com>
              Signed-off-by: Jan Hoeppner <hoeppner@linux.ibm.com>


Signed-off-by: Joern Siglen <siglen@de.ibm.com>
--- s390-tools-service.orig/scripts/dbginfo.sh
+++ s390-tools-service/scripts/dbginfo.sh
@@ -251,13 +251,14 @@ readonly OUTPUT_FILE_OSAOAT="${WORKPATH}
 readonly OUTPUT_FILE_SYSFS="${WORKPATH}sysfs"
 
 # define order of collection steps
+# - state/debug files are collected first, to avoid overwriting by command execution
 ALL_STEPS="\
+ collect_sysfs\
+ collect_procfs\
+ collect_configfiles\
  collect_cmdsout\
  collect_hyptop\
  collect_vmcmdsout\
- collect_procfs\
- collect_sysfs\
- collect_configfiles\
  collect_network\
  collect_osaoat\
  collect_ethtool\
--- s390-tools-service.orig/scripts/dbginfo.sh.1
+++ s390-tools-service/scripts/dbginfo.sh.1
@@ -1,4 +1,4 @@
-.TH DBGINFO.SH  1 "April 2021" "s390-tools"
+.TH DBGINFO.SH  1 "September 2021" "s390-tools"
 
 .SH NAME
 dbginfo.sh \- collect runtime, configuration and trace information
@@ -71,17 +71,17 @@ OS version / distro   = Red Hat Enterpri
 .br
 Date and time of info = 2021-08-26-15-27-58
 .PP
-1 of 18: Collecting command output
+1 of 18: Collecting sysfs
 .PP
-2 of 18: Collecting hyptop for z/VM - 5s output
+2 of 18: Collecting procfs
 .PP
-3 of 18: Collecting z/VM output
+3 of 18: Collecting config files
 .PP
-4 of 18: Collecting procfs
+4 of 18: Collecting command output
 .PP
-5 of 18: Collecting sysfs
+5 of 18: Collecting hyptop for z/VM - 5s output
 .PP
-6 of 18: Collecting config files
+6 of 18: Collecting z/VM output
 .PP
 7 of 18: Collecting network output
 .PP