summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrikrishan Malik <srimalik@in.ibm.com>2013-12-13 13:05:53 +0530
committerMartin Schwenke <martins@samba.org>2014-01-30 11:18:19 +0100
commit164ee000df2a3ffc91690c60d08e4ea7ff1a33f2 (patch)
tree10ffd57cb00e90bbdebaba9d44bff7da8a472e82
parentc2b8d31b133ac1d1e18eae5e52188b2b0b7ea008 (diff)
downloadsamba-164ee000df2a3ffc91690c60d08e4ea7ff1a33f2.tar.gz
samba-164ee000df2a3ffc91690c60d08e4ea7ff1a33f2.tar.xz
samba-164ee000df2a3ffc91690c60d08e4ea7ff1a33f2.zip
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
-rwxr-xr-xctdb/config/events.d/60.ganesha7
1 files 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