From 164ee000df2a3ffc91690c60d08e4ea7ff1a33f2 Mon Sep 17 00:00:00 2001
From: Srikrishan Malik <srimalik@in.ibm.com>
Date: Fri, 13 Dec 2013 13:05:53 +0530
Subject: ctdb-eventscripts: Do not mark node unhealthy if no fs is available

Signed-off-by: Srikrishan Malik <srimalik@in.ibm.com>
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>

Autobuild-User(master): Martin Schwenke <martins@samba.org>
Autobuild-Date(master): Thu Jan 30 11:18:19 CET 2014 on sn-devel-104
---
 ctdb/config/events.d/60.ganesha | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ctdb/config/events.d/60.ganesha b/ctdb/config/events.d/60.ganesha
index 6e7d47df33..1d3263837c 100755
--- a/ctdb/config/events.d/60.ganesha
+++ b/ctdb/config/events.d/60.ganesha
@@ -65,11 +65,12 @@ get_cluster_fs_state  ()
 
 create_ganesha_recdirs ()
 {
-    if [ -z "$(mount -t $CTDB_CLUSTER_FILESYSTEM_TYPE)" ]; then
+    MOUNTS=$(mount -t $CTDB_CLUSTER_FILESYSTEM_TYPE)
+    if [ -z "$MOUNTS" ]; then
       echo "startup $CTDB_CLUSTER_FILESYSTEM_TYPE not ready"
-      exit 1
+      exit 0
     fi
-    MNTPT=`mount -t $CTDB_CLUSTER_FILESYSTEM_TYPE | sort | awk '{print $3}' | head -n 1`
+    MNTPT=$(echo "$MOUNTS" | sort | awk 'NR == 1 {print $3}')
     mkdir -p $MNTPT/.ganesha
     if [ -e $GANRECDIR ]; then
         if [ ! -L $GANRECDIR ] ; then
-- 
cgit