support ocfs2 log collecting

Author: Larry Chen

hb_report/constants.py

@@ -138,5 +138,6 @@
 SYSINFO_F = "sysinfo.txt"
 SYSSTATS_F = "sysstats.txt"
 TIME_F = "time.txt"
+OCFS2_F = "ocfs2.txt"
 
 # vim:ts=4:sw=4:et:

hb_report/utillib.py

@@ -283,6 +283,7 @@ def collect_info():
     time_status()
     corosync_blackbox()
     get_ratraces()
+    dump_ocfs2()
 
     for p in process_list:
         p.join()
@@ -441,7 +442,7 @@ def dlm_dump():
         for item in grep("^name", incmd="dlm_tool ls"):
             lock_name = item.split()[1]
             out_string += "## NOTICE - Lockspace {}\n".format(lock_name)
-            out_string += get_command_info("dlm_tool lockdump {}".format(lock_name))[1] + '\n'
+            out_string += get_command_info("dlm_tool lockdebug {}".format(lock_name))[1] + '\n'
         out_string += "##### NOTICE - Lockspace history:\n"
         out_string += get_command_info("dlm_tool dump")[1] + '\n'
 
@@ -1629,6 +1630,22 @@ def time_status():
     time_f = os.path.join(constants.WORKDIR, constants.TIME_F)
     crmutils.str2file(out_string, time_f)
 
+def dump_ocfs2():
+    ocfs2_f = os.path.join(constants.WORKDIR, constants.OCFS2_F)
+    with open(ocfs2_f, "w") as f:
+        #dump all tasks stack into dmesg
+        os.system("echo t > /proc/sysrq-trigger")
+
+        cmds = [ "dmesg",  "ps -efL", "lsof",
+                "lsblk -o 'NAME,KNAME,MAJ:MIN,FSTYPE,LABEL,RO,RM,MODEL,SIZE,OWNER,GROUP,MODE,ALIGNMENT,MIN-IO,OPT-IO,PHY-SEC,LOG-SEC,ROTA,SCHED,MOUNTPOINT'",
+                "mounted.ocfs2 -f", "findmnt", "mount",
+                "cat /sys/fs/ocfs2/cluster_stack"
+                ]
+        for cmd in cmds:
+            _, out = crmutils.get_stdout(cmd)
+            f.write("\n\n#=====[ Command ] ==========================#\n")
+            f.write("# %s\n"%(cmd))
+            f.write(out)
 
 def touch_dc():
     if constants.SKIP_LVL: