commit c199dc320b4faa01c19df68a9f2566465f5afa2c Author: Gao,Yan Date: Mon Jun 13 17:26:27 2016 +0200 Fix: controld: Prevent unwanted self-fencing if "stateful_merge_wait" state of dlm is not available Index: pacemaker-1.1.18+20180427.a34ccd926/extra/resources/controld =================================================================== --- pacemaker-1.1.18+20180427.a34ccd926.orig/extra/resources/controld +++ pacemaker-1.1.18+20180427.a34ccd926/extra/resources/controld @@ -227,10 +227,6 @@ controld_monitor() { if [ -n "$smw" ] && [ $smw -eq 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