From 1f69984d391568ac86d2c5c930a770ea067ac9a8 Mon Sep 17 00:00:00 2001
From: "Kaleb S. KEITHLEY" <kkeithle@redhat.com>
Date: Thu, 17 Nov 2016 07:19:18 -0500
Subject: [PATCH 171/206] nfs-ganesha (common-ha): grace monitor timed out,
unknown error,
Upstream BZs: 1394224 (master), 1394225 (3.9), 1394226 (3.8)
Upstream Change-Id: I3d550e33cc3d0a8dce4333ced72db19b3b2f4f2e
Upstream change (master): http://review.gluster.org/#/c/15831
Upstream change (3.9): http://review.gluster.org/#/c/15832
Upstream change (3.8): http://review.gluster.org/#/c/15833
Change-Id: Ia43dd06335376c506a7ddc1a43d1d45c91190d4d
BUG: 1337565
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/90460
Reviewed-by: Jiffin Thottan <jthottan@redhat.com>
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
Tested-by: Atin Mukherjee <amukherj@redhat.com>
---
extras/ganesha/ocf/ganesha_grace | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/extras/ganesha/ocf/ganesha_grace b/extras/ganesha/ocf/ganesha_grace
index 84202df..cb6dcc4 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()
--
2.9.3