summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2016-11-11 08:06:03 -0500
committerKaleb KEITHLEY <kkeithle@redhat.com>2016-11-16 02:26:40 -0800
commitb5387f90f942bfc7cf0f7f969740f8bf1c911b80 (patch)
treec748eb71d4b2372e513482796a3765d6e1bbb404
parent8a1993b32f476765f9f5c9294e7c3f2ae75198a0 (diff)
common-ha: nfs-grace-monitor timed out unknown error messages
grace_mon_monitor() occasionally returns OCF_ERR_GENERIC, but it ought to return OCF_NOT_RUNNING instead. Change-Id: I3d550e33cc3d0a8dce4333ced72db19b3b2f4f2e BUG: 1394224 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/15831 Smoke: Gluster Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: soumya k <skoduri@redhat.com> Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
-rw-r--r--extras/ganesha/ocf/ganesha_grace5
1 files changed, 2 insertions, 3 deletions
diff --git a/extras/ganesha/ocf/ganesha_grace b/extras/ganesha/ocf/ganesha_grace
index 84202df9aa2..cb6dcc4e867 100644
--- a/extras/ganesha/ocf/ganesha_grace
+++ b/extras/ganesha/ocf/ganesha_grace
@@ -164,7 +164,6 @@ ganesha_grace_notify()
ganesha_grace_monitor()
{
- local rc=${OCF_ERR_GENERIC}
local host=$(hostname -s)
ocf_log debug "monitor"
@@ -187,10 +186,10 @@ ganesha_grace_monitor()
fi
if [[ "${attr}" = *"value=1" ]]; then
- rc=${OCF_SUCCESS}
+ return ${OCF_SUCCESS}
fi
- return ${rc}
+ return ${OCF_NOT_RUNNING}
}
ganesha_grace_validate()