commit f61b9889cd169ce2c715a5cc4808321977432ec0 Author: Gao,Yan Date: Sun May 29 20:31:25 2016 +0200 Fix: controld: Prevent unwanted self-fencing if "stateful_merge_wait" state of dlm is not available diff --git a/extra/resources/controld b/extra/resources/controld index 7d75319..908e2ca 100644 --- a/extra/resources/controld +++ b/extra/resources/controld @@ -229,13 +229,9 @@ controld_monitor() { case $rc in 0) smw=$(dlm_tool status -v | grep "stateful_merge_wait=" | cut -d= -f2) - if [ $smw -eq 1 ]; then + if [ "$smw" = "1" ]; then ocf_log err "DLM status is: stateful_merge_wait" rc=$OCF_ERR_GENERIC - elif [ -z "$smw" ] && dlm_tool ls | grep -q "wait fencing" && \ - ! stonith_admin -H -V | grep -q "wishes to"; then - ocf_log err "DLM status is: wait fencing" - rc=$OCF_ERR_GENERIC else rc=$OCF_SUCCESS fi