From 84263cb37ff9b47885c99170b573b84389944300 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobrelia@mirantis.com>
Date: Fri, 6 May 2016 17:30:21 +0200
Subject: [PATCH] Fix OCF MySQL monitor

Return success if SST detected, otherwise check status
and return error if it is not OK.

Closes-bug: #1574999

Change-Id: I5ee7807821ae1f21bcb3c74e15338acb8bb91ea1
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
---
 files/fuel-ha-utils/ocf/mysql-wss | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/files/fuel-ha-utils/ocf/mysql-wss b/files/fuel-ha-utils/ocf/mysql-wss
index e06e651350..eaa1753011 100755
--- a/files/fuel-ha-utils/ocf/mysql-wss
+++ b/files/fuel-ha-utils/ocf/mysql-wss
@@ -537,21 +537,13 @@ mysql_monitor() {
         status_loglevel="info"
     fi
 
+    check_if_sst
+    rc=$?
+    [ $rc -eq $OCF_SUCCESS ] && return $rc
+
     mysql_status $status_loglevel
     rc=$?
-    check_if_sst
-    rc2=$?
-    if [ $rc2 -eq $OCF_SUCCESS -a $rc -ne $OCF_SUCCESS ] ; then
-       # The sst_in_progress file isn't removed if mysqld has died and shall be purged
-       ocf_log warn "${LH} found and purged a stale sst_in_progress file"
-       rm -f "${OCF_RESKEY_datadir}/sst_in_progress"
-    elif [ $rc2 -eq $OCF_SUCCESS ]; then
-       return $OCF_SUCCESS
-    fi
-
-    if [ $rc -ne $OCF_SUCCESS ]; then
-        return $rc
-    fi
+    [ $rc -eq $OCF_SUCCESS ] || return $rc
 
     update_node_gtid