The branch, master has been updated
via 164ee00 ctdb-eventscripts: Do not mark node unhealthy if no fs is
available
from c2b8d31 param: Do not check defaults_saved in is_default
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 164ee000df2a3ffc91690c60d08e4ea7ff1a33f2
Author: Srikrishan Malik <[email protected]>
Date: Fri Dec 13 13:05:53 2013 +0530
ctdb-eventscripts: Do not mark node unhealthy if no fs is available
Signed-off-by: Srikrishan Malik <[email protected]>
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Autobuild-User(master): Martin Schwenke <[email protected]>
Autobuild-Date(master): Thu Jan 30 11:18:19 CET 2014 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
ctdb/config/events.d/60.ganesha | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/config/events.d/60.ganesha b/ctdb/config/events.d/60.ganesha
index 6e7d47d..1d32638 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
--
Samba Shared Repository
