summaryrefslogtreecommitdiffstats
path: root/extras/ganesha
diff options
context:
space:
mode:
authorKaleb S. KEITHLEY <kkeithle@redhat.com>2015-04-08 08:03:58 -0400
committerNiels de Vos <ndevos@redhat.com>2015-04-08 17:50:09 +0000
commit6ae434eeb3bfe421f34e624182d46ee11f57c736 (patch)
tree791bd09cdc618872c466dcf76c4c3e01915c74e6 /extras/ganesha
parent4be65bb376e2fffd7175f579724aae4c5718d57c (diff)
ganesha-ha: more robust pid file handling
fix bug with reading pid file to determine if ganesha.nfsd is running Change-Id: I4050a119e2be93578045a221b67f616e152546d9 BUG: 1188184 Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/10163 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'extras/ganesha')
-rw-r--r--extras/ganesha/ocf/ganesha_grace3
-rw-r--r--extras/ganesha/ocf/ganesha_mon8
2 files changed, 6 insertions, 5 deletions
diff --git a/extras/ganesha/ocf/ganesha_grace b/extras/ganesha/ocf/ganesha_grace
index 45819c9a619..397b0abdeab 100644
--- a/extras/ganesha/ocf/ganesha_grace
+++ b/extras/ganesha/ocf/ganesha_grace
@@ -94,7 +94,8 @@ ganesha_grace_start()
# of the ganesha.nfsds have died, triggering a floating IP
# address to move. Resource constraint location rules ensure
# that this is invoked before the floating IP is moved.
- if [ -d /proc/$(cat /var/run/ganesha.nfsd.pid) ]; then
+ if [ -e /var/run/ganesha.nfsd.pid -a \
+ -d /proc/$(cat /var/run/ganesha.nfsd.pid) ]; then
# my ganesha.nfsd is still running
# find out which one died?
diff --git a/extras/ganesha/ocf/ganesha_mon b/extras/ganesha/ocf/ganesha_mon
index c03d7ee5ec9..6ba7178235b 100644
--- a/extras/ganesha/ocf/ganesha_mon
+++ b/extras/ganesha/ocf/ganesha_mon
@@ -96,8 +96,9 @@ ganesha_mon_monitor()
{
local short_host=$(hostname -s)
- if [ -d /proc/$(cat /var/run/ganesha.nfsd.pid) ]; then
- # logger "ganesha_mon_monitor(), attrd_updater -n ganesha-active -v 1"
+ if [ -e /var/run/ganesha.nfsd.pid -a \
+ -d /proc/$(cat /var/run/ganesha.nfsd.pid) ]; then
+ # logger "note: ganesha_mon_monitor() pcs resource delete ${short_host}-dead_ip-1"
pcs resource delete ${short_host}-dead_ip-1
# if [ $? -ne 0 ]; then
# logger "warning: pcs resource delete ${short_host}-dead_ip-1"
@@ -111,8 +112,7 @@ ganesha_mon_monitor()
fi
else
- # logger "ganesha_mon_monitor(), attrd_updater --D -n ganesha-active"
-
+ # logger "note: ganesha_mon_montor(), pcs resource create ${short_host}-dead_ip-1 ocf:heartbeat:Dummy"
pcs resource create ${short_host}-dead_ip-1 ocf:heartbeat:Dummy
if [ $? -ne 0 ]; then
logger "warning: pcs resource create ${short_host}-dead_ip-1 ocf:heartbeat:Dummy failed"