[SCM] CTDB repository - branch 2.5 updated - ctdb-2.5.1-23-geb51452
Amitay Isaacs
amitay at samba.org
Thu Jan 30 18:16:32 MST 2014
The branch, 2.5 has been updated
via eb514524e764834a9898fb0ca787c710fb8f9c85 (commit)
from fdc0daae4b680990b2ebe7140a6aec7d8e33b959 (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=2.5
- Log -----------------------------------------------------------------
commit eb514524e764834a9898fb0ca787c710fb8f9c85
Author: Srikrishan Malik <srimalik at in.ibm.com>
Date: Fri Dec 13 13:05:53 2013 +0530
eventscripts: Do not mark node unhealthy if no fs is available
Signed-off-by: Srikrishan Malik <srimalik at in.ibm.com>
Signed-off-by: Amitay Isaacs <amitay at gmail.com>
Reviewed-by: Martin Schwenke <martin at meltin.net>
Autobuild-User(master): Martin Schwenke <martins at samba.org>
Autobuild-Date(master): Thu Jan 30 11:18:19 CET 2014 on sn-devel-104
(Imported from commit 164ee000df2a3ffc91690c60d08e4ea7ff1a33f2)
-----------------------------------------------------------------------
Summary of changes:
config/events.d/60.ganesha | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/60.ganesha b/config/events.d/60.ganesha
index 89b63ff..43e6758 100755
--- a/config/events.d/60.ganesha
+++ b/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
--
CTDB repository
More information about the samba-cvs
mailing list