Merge pull request ClusterLabs#1547 from petrpavlu/galera-bootstrap

galera: Fix automatic recovery when a cluster was not gracefully stopped

Author: oalbrigt

heartbeat/galera

@@ -604,12 +604,17 @@ detect_safe_to_bootstrap()
  seqno=$(sed -n 's/^seqno:\s*\(.*\)$/\1/p' < ${OCF_RESKEY_datadir}/grastate.dat)
  fi
 
- if [ -z "$uuid" ] || [ -z "$seqno" ] || \
- [ "$uuid" = "00000000-0000-0000-0000-000000000000" ] || \
- [ "$seqno" = "-1" ]; then
+ if [ -z "$uuid" ] || \
+ [ "$uuid" = "00000000-0000-0000-0000-000000000000" ]; then
  clear_safe_to_bootstrap
  return
  fi
+ if [ "$safe_to_bootstrap" = "1" ]; then
+ if [ -z "$seqno" ] || [ "$seqno" = "-1" ]; then
+ clear_safe_to_bootstrap
+ return
+ fi
+ fi
 
  if [ "$safe_to_bootstrap" = "1" ] || [ "$safe_to_bootstrap" = "0" ]; then
  set_safe_to_bootstrap $safe_to_bootstrap