diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-06-06 15:25:28 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2014-06-11 09:29:22 +0200 |
| commit | 6da8126a115419587672d16e2440c322a837da6b (patch) | |
| tree | bee3ee3009fc59d9ae2ca3961ff9963dec49c147 | |
| parent | f4e358bc8b5490ebc696525d5e190f2e9364e196 (diff) | |
| download | samba-6da8126a115419587672d16e2440c322a837da6b.tar.gz samba-6da8126a115419587672d16e2440c322a837da6b.tar.xz samba-6da8126a115419587672d16e2440c322a837da6b.zip | |
ctdb-eventscripts: New configuration variable CTDB_GANESHA_REC_SUBDIR
Backup and restore of the cluster filesystem can upset the operation
of 60.ganesha by changing the contents of this subdirectory.
Allow this subdirectory to be configured to a subdirectory that is
ignored by backup and restore processes.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Wed Jun 11 09:29:22 CEST 2014 on sn-devel-104
| -rwxr-xr-x | ctdb/config/events.d/60.ganesha | 8 | ||||
| -rw-r--r-- | ctdb/doc/ctdbd.conf.5.xml | 15 |
2 files changed, 20 insertions, 3 deletions
diff --git a/ctdb/config/events.d/60.ganesha b/ctdb/config/events.d/60.ganesha index e8a52b03b86..e085ed3bf83 100755 --- a/ctdb/config/events.d/60.ganesha +++ b/ctdb/config/events.d/60.ganesha @@ -82,22 +82,24 @@ get_nodenum() create_ganesha_recdirs () { + [ -n "$CTDB_GANESHA_REC_SUBDIR" ] || CTDB_GANESHA_REC_SUBDIR=".ganesha" + MOUNTS=$(mount -t $CTDB_CLUSTER_FILESYSTEM_TYPE) if [ -z "$MOUNTS" ]; then echo "startup $CTDB_CLUSTER_FILESYSTEM_TYPE not ready" exit 0 fi MNTPT=$(echo "$MOUNTS" | sort | awk 'NR == 1 {print $3}') - mkdir -p $MNTPT/.ganesha + mkdir -p $MNTPT/$CTDB_GANESHA_REC_SUBDIR if [ -e $GANRECDIR ]; then if [ ! -L $GANRECDIR ] ; then rm -rf $GANRECDIR - if ! ln -s $MNTPT/.ganesha $GANRECDIR ; then + if ! ln -s $MNTPT/$CTDB_GANESHA_REC_SUBDIR $GANRECDIR ; then echo "ln failed" fi fi else - if ! ln -sf $MNTPT/.ganesha $GANRECDIR ; then + if ! ln -sf $MNTPT/$CTDB_GANESHA_REC_SUBDIR $GANRECDIR ; then echo "ln failed" fi fi diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml index 98d09249320..149aa627f03 100644 --- a/ctdb/doc/ctdbd.conf.5.xml +++ b/ctdb/doc/ctdbd.conf.5.xml @@ -923,6 +923,21 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000 </varlistentry> <varlistentry> + <term>CTDB_GANESHA_REC_SUBDIR<parameter>SUBDIR</parameter></term> + <listitem> + <para> + SUBDIR is the name of a top-level subdirectory in the + first cluster filesystem. This subdirectory is used to + allow communication between NFS-Ganesha and the + <filename>60.ganesha</filename> script. + </para> + <para> + Default is ".ganesha". + </para> + </listitem> + </varlistentry> + + <varlistentry> <term>CTDB_MANAGES_NFS=yes|no</term> <listitem> <para> |