File bug-977201_pacemaker-controld-dlm-stateful_merge_wait-1.patch of Package pacemaker.3577

commit 2154978a505cbcd4caba7544981cd2aeffb9b653
Author: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date:   Wed May 25 19:09:12 2016 +0200

    controld: improve DLM check with stateful_merge_wait

diff --git a/extra/resources/controld b/extra/resources/controld
index a0eb8f2..7d75319 100644
--- a/extra/resources/controld
+++ b/extra/resources/controld
@@ -228,8 +228,12 @@ controld_monitor() {
     killall -0 ${OCF_RESKEY_daemon} >/dev/null 2>&1 ; rc=$?
 
     case $rc in
-      0) dlm_tool ls | grep -q "wait fencing"
-         if [ $? -eq 0 ]; then
+      0) smw=$(dlm_tool status -v | grep "stateful_merge_wait=" | cut -d= -f2)
+         if [ $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