Add more cluster/clvmd information to lvmdump

diff --git a/WHATS_NEW b/WHATS_NEW
index 0170b89976ecfe22b589ebebd4845abf8b67d530..e14392480f83cef8fbac8a80921bc072391a0f47 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.28 -
 ================================
+  Add more cluster info to lvmdump
   Add const attributes where possible, first cut.
   Add support for renaming mirrored LVs.
   Factor out core of lvrename() to lv_rename lvm library function.

diff --git a/scripts/lvm_dump.sh b/scripts/lvm_dump.sh
index 638348720a7787815f64823cbf2ba9dfb9cf2ba6..0ab9ffdcbb04ec6e7162f0e4d56654ce5c75a063 100755 (executable)
--- a/scripts/lvm_dump.sh
+++ b/scripts/lvm_dump.sh
@@ -116,15 +116,45 @@ fi
 
 if (( $clustered )); then
        myecho "Gathering cluster info..."
+       echo "NODES: " > $dir/cluster_info
+       echo "----------------------------------" >> $dir/cluster_info
+       log "cman_tool nodes >> $dir/cluster_info 2>> $log"
+       echo " " >> $dir/cluster_info
+
        echo "STATUS: " > $dir/cluster_info
        echo "----------------------------------" >> $dir/cluster_info
        log "cman_tool status >> $dir/cluster_info 2>> $log"
-       echo " " >> $dir/lvm_info
+       echo " " >> $dir/cluster_info
 
        echo "SERVICES: " >> $dir/cluster_info
        echo "----------------------------------" >> $dir/cluster_info
        log "cman_tool services >> $dir/cluster_info 2>> $log"
-       echo " " >> $dir/lvm_info
+       echo " " >> $dir/cluster_info
+
+       echo "LOCKS: "  >> $dir/cluster_info
+       echo "----------------------------------" >> $dir/cluster_info
+       if [ -f /proc/cluster/dlm_locks ]
+       then
+               echo "clvmd" > /proc/cluster/dlm_locks
+               cat /proc/cluster/dlm_locks >> $dir/cluster_info
+               echo " " >> $dir/cluster_info
+               echo "RESOURCE DIR: "  >> $dir/cluster_info
+               cat /proc/cluster/dlm_dir >> $dir/cluster_info
+               echo " " >> $dir/cluster_info
+               echo "DEBUG LOG: "  >> $dir/cluster_info
+               cat /proc/cluster/dlm_debug >> $dir/cluster_info
+               echo " " >> $dir/cluster_info
+       fi
+       if [ -f /debug/dlm/clvmd ]
+       then
+               cat /debug/dlm/clvmd >> $dir/cluster_info
+               echo " " >> $dir/cluster_info
+               echo "WAITERS: "  >> $dir/cluster_info
+               cat /debug/dlm/clvmd_waiters >> $dir/cluster_info
+               echo " " >> $dir/cluster_info
+               echo "MASTER: "  >> $dir/cluster_info
+               cat /debug/dlm/clvmd_master >> $dir/cluster_info
+       fi
 fi
 
 myecho "Gathering LVM & device-mapper version info..."