remove 59.nfslock and fold this into 60.nfs

add a 61.nfstickle script to make nfs failover faster

(This used to be ctdb commit da71fa874d49346d229307d424f889994a205c89)

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index 84dcf338342b42a0cfff324883fc5a832e09d965..2891a2248cf9dc6d8cc145b98a356945215fa183 100644 (file)
--- a/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@ -137,8 +137,8 @@ install: all
        ${INSTALLCMD} -m 755 config/events.d/10.interface $(DESTDIR)$(etcdir)/ctdb/events.d
        ${INSTALLCMD} -m 755 config/events.d/40.vsftpd $(DESTDIR)$(etcdir)/ctdb/events.d
        ${INSTALLCMD} -m 755 config/events.d/50.samba $(DESTDIR)$(etcdir)/ctdb/events.d
-       ${INSTALLCMD} -m 755 config/events.d/59.nfslock $(DESTDIR)$(etcdir)/ctdb/events.d
        ${INSTALLCMD} -m 755 config/events.d/60.nfs $(DESTDIR)$(etcdir)/ctdb/events.d
+       ${INSTALLCMD} -m 755 config/events.d/61.nfstickle $(DESTDIR)$(etcdir)/ctdb/events.d
        ${INSTALLCMD} -m 755 tools/onnode.ssh $(DESTDIR)$(bindir)
        ${INSTALLCMD} -m 755 tools/onnode.rsh $(DESTDIR)$(bindir)
        if [ -f doc/ctdb.1 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man1; fi

diff --git a/ctdb/config/events.d/59.nfslock b/ctdb/config/events.d/59.nfslock
deleted file mode 100755 (executable)
index 1dba335..0000000
--- a/ctdb/config/events.d/59.nfslock
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-# event strict to manage lockd and statd in a cluster environment
-
-. /etc/ctdb/functions
-loadconfig nfs
-
-[ "$CTDB_MANAGES_NFSLOCK" = "yes" ] || exit 0
-
-[ -z "$STATD_SHARED_DIRECTORY" ] && exit 0
-
-cmd="$1"
-shift
-
-case $cmd in 
-     startup)
-       /bin/mkdir -p /etc/ctdb/state/statd/ip
-       ctdb_wait_directories "nfslock" "$STATD_SHARED_DIRECTORY"
-
-       # make sure the service is stopped first
-       service nfslock stop > /dev/null 2>&1
-       service nfslock start
-       ;;
-
-     shutdown)
-       service nfslock stop
-       ;;
-
-     takeip)
-       ip=$2
-
-       echo $ip >> /etc/ctdb/state/statd/restart
-
-       # having a list of what IPs we have allows statd to do the right 
-       # thing via /etc/ctdb/statd-callout
-       /bin/touch /etc/ctdb/state/statd/ip/$ip
-       ;;
-
-     releaseip)
-       ip=$2
-
-       echo $ip >> /etc/ctdb/state/statd/restart
-       /bin/rm -f /etc/ctdb/state/statd/ip/$ip
-       ;;
-
-     recovered)
-       # if we have taken or released any ips we must send out
-       # statd notifications to recover lost nfs locks
-       [ -x /etc/ctdb/statd-callout ] && [ -f /etc/ctdb/state/statd/restart ] && {
-               /etc/ctdb/statd-callout notify &
-       } >/dev/null 2>&1
-
-       /bin/rm -f /etc/ctdb/state/statd/restart
-       ;;
-
-      monitor)
-       # check that lockd responds to rpc requests
-       ctdb_check_rpc "statd" 100024 1
-       ctdb_check_rpc "lockd" 100021 1
-       ctdb_check_directories "statd" $STATD_SHARED_DIRECTORY
-       ;;
-
-esac
-
-exit 0

diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events.d/60.nfs
index 549d87cc233268ff4947c3208d6ba4a724497301..48b50f126b3bd57e07bcd0211acc92ac554ed53f 100755 (executable)
--- a/ctdb/config/events.d/60.nfs
+++ b/ctdb/config/events.d/60.nfs
@@ -5,6 +5,7 @@
 loadconfig nfs
 
 [ "$CTDB_MANAGES_NFS" = "yes" ] || exit 0
+[ -z "$STATD_SHARED_DIRECTORY" ] && exit 0
 
 cmd="$1"
 shift
@@ -14,6 +15,9 @@ PATH=/usr/bin:/bin:/usr/sbin:/sbin:$PATH
 case $cmd in 
      startup)
        mkdir -p /etc/ctdb/state/nfs
+       /bin/mkdir -p /etc/ctdb/state/statd/ip
+       ctdb_wait_directories "nfslock" "$STATD_SHARED_DIRECTORY"
+
 
        # wait for all nfs exported directories to become available
        nfs_dirs=`grep -v '^#' < /etc/exports | cut -d' ' -f1`
@@ -21,11 +25,27 @@ case $cmd in
 
        # make sure nfs is stopped before we start it, or it may get a bind error
        service nfs stop > /dev/null 2>&1
+       service nfslock stop > /dev/null 2>&1
+
+       service nfslock start
        service nfs start
        ;;
 
      shutdown)
        service nfs stop
+       service nfslock stop
+       exit 0
+       ;;
+
+     takeip)
+       ip=$2
+
+       echo $ip >> /etc/ctdb/state/statd/restart
+
+       # having a list of what IPs we have allows statd to do the right 
+       # thing via /etc/ctdb/statd-callout
+       /bin/touch /etc/ctdb/state/statd/ip/$ip
+       exit 0
        ;;
 
      releaseip)
@@ -34,6 +54,9 @@ case $cmd in
        maskbits=$3
 
        echo $ip >> /etc/ctdb/state/nfs/restart
+
+       echo $ip >> /etc/ctdb/state/statd/restart
+       /bin/rm -f /etc/ctdb/state/statd/ip/$ip
        exit 0
        ;;
 
@@ -42,9 +65,18 @@ case $cmd in
        # are closed
        [ -f /etc/ctdb/state/nfs/restart ] && {
                ( service nfs status > /dev/null 2>&1 && 
-                      service nfs restart > /dev/null 2>&1 ) &
+                      service nfs restart > /dev/null 2>&1 &&
+                     service nfslock restart > /dev/null 2>&1 ) &
        } > /dev/null 2>&1
        /bin/rm -f /etc/ctdb/state/nfs/restart
+
+       # if we have taken or released any ips we must send out
+       # statd notifications to recover lost nfs locks
+       [ -x /etc/ctdb/statd-callout ] && [ -f /etc/ctdb/state/statd/restart ] && {
+               /etc/ctdb/statd-callout notify &
+       } >/dev/null 2>&1
+
+       /bin/rm -f /etc/ctdb/state/statd/restart
        ;;
 
       monitor)
@@ -55,6 +87,11 @@ case $cmd in
        # and that its directories are available
        nfs_dirs=`grep -v '^#' < /etc/exports | cut -d' ' -f1`
        ctdb_check_directories "nfs" $nfs_dirs
+
+       # check that lockd responds to rpc requests
+       ctdb_check_rpc "statd" 100024 1
+       ctdb_check_rpc "lockd" 100021 1
+       ctdb_check_directories "statd" $STATD_SHARED_DIRECTORY
        ;;
 
 esac

diff --git a/ctdb/config/events.d/61.nfstickle b/ctdb/config/events.d/61.nfstickle
new file mode 100755 (executable)
index 0000000..ff953ea
--- /dev/null
+++ b/ctdb/config/events.d/61.nfstickle
@@ -0,0 +1,79 @@
+#!/bin/sh
+# ctdb event script for NFS tickle acks
+
+PATH=/bin:/usr/bin:$PATH
+
+. /etc/ctdb/functions
+loadconfig nfs
+
+cmd="$1"
+shift
+
+[ -z "$NFS_TICKLE_SHARED_DIRECTORY" ] && exit 0
+
+[ -x /usr/bin/sendip ] || exit 0
+
+case $cmd in 
+     startup)
+       mkdir -p /etc/ctdb/state/nfstickle
+       mkdir -p $NFS_TICKLE_SHARED_DIRECTORY/`hostname`
+       # we rely on fast tcp wait1 recycling
+       echo 1 > /proc/sys/net/ipv4/tcp_tw_recycle
+       exit 0
+       ;;
+       
+     takeip)
+       iface=$1
+       ip=$2
+       shopt -s nullglob
+       # send tickle acks for all the connections the old server had
+       for f in $NFS_TICKLE_SHARED_DIRECTORY/*/$ip; do
+               cat $f | while read dest; do
+                       dip=`echo $dest | cut -d: -f1`
+                       dport=`echo $dest | cut -d: -f2`
+                       # send three, in case of lost packets
+                       echo "`date` Sending NFS tickle ack for $ip to $dip:$dport"
+                       for i in `seq 1 3`; do
+                               sendip -p ipv4 -p tcp -is $ip -ts 2049 -td $dport -tfa 1 $dip -tfs 0 -tw 1234 -tfp 0 -tn 0
+                       done
+               done
+       done
+       exit 0
+       ;;
+
+     releaseip)
+       iface=$1
+       ip=$2
+       if netstat -tn | egrep "^tcp.*$ip:2049.*ESTABLISHED" > /dev/null 2>&1; then
+               echo "`date` Restarting NFS due to established connections for IP $ip"
+               ( service nfs status > /dev/null 2>&1 && 
+                      service nfs restart > /dev/null 2>&1 ) &
+       fi              
+       exit 0
+       ;;
+
+     recovered)
+       exit 0
+       ;;
+
+     shutdown)
+       exit 0
+       ;;
+
+     monitor)
+       mydir=$NFS_TICKLE_SHARED_DIRECTORY/`hostname`
+       rm -f $mydir/*
+       # record our connections to shared storage
+       netstat -tn |egrep '^tcp\s+[0-9]+\s+[0-9]+\s+[0-9\.]+:2049.*ESTABLISHED' |
+               awk '{print $4" "$5}' | 
+               while read dest src; do
+                       ip=`echo $dest | cut -d: -f1`
+                       echo $src >> $mydir/$ip
+               done
+       exit 0
+       ;;
+
+esac
+
+# ignore unknown commands
+exit 0

diff --git a/ctdb/doc/ctdb.1.html b/ctdb/doc/ctdb.1.html
index e016118f68241cf90480f36b93f0bfd6bd908ce9..ce33780b61c5d0dfd9b74188f60a994d1d44f683 100644 (file)
--- a/ctdb/doc/ctdb.1.html
+++ b/ctdb/doc/ctdb.1.html
@@ -1,6 +1,6 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>ctdb</title><meta name="generator" content="DocBook XSL Stylesheets V1.72.0"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en"><a name="ctdb.1"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>ctdb &#8212; clustered tdb database management utility</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">ctdb [ OPTIONS ] COMMAND ...</code> </p></div><div class="cmdsynopsis"><p><code class="command">ctdb</code>  [-n &lt;node&gt;] [-Y] [-t &lt;timeout&gt;] [-? --help] [--usage] [-d --debug=&lt;INTEGER&gt;] [--socket=&lt;filename&gt;]</p></div></div><div class="refsect1" lang="en"><a name="id2488862"></a><h2>DESCRIPTION</h2><p>
+<html><head><meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>ctdb</title><meta name="generator" content="DocBook XSL Stylesheets V1.71.0"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" lang="en"><a name="ctdb.1"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>ctdb &#8212; clustered tdb database management utility</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">ctdb [ OPTIONS ] COMMAND ...</code> </p></div><div class="cmdsynopsis"><p><code class="command">ctdb</code>  [-n &lt;node&gt;] [-Y] [-t &lt;timeout&gt;] [-? --help] [--usage] [-d --debug=&lt;INTEGER&gt;] [--socket=&lt;filename&gt;]</p></div></div><div class="refsect1" lang="en"><a name="id2480829"></a><h2>DESCRIPTION</h2><p>
       ctdb is a utility to view and manage a ctdb cluster.
-    </p></div><div class="refsect1" lang="en"><a name="id2488872"></a><h2>OPTIONS</h2><div class="variablelist"><dl><dt><span class="term">-n &lt;node&gt;</span></dt><dd><p>
+    </p></div><div class="refsect1" lang="en"><a name="id2480839"></a><h2>OPTIONS</h2><div class="variablelist"><dl><dt><span class="term">-n &lt;node&gt;</span></dt><dd><p>
             This specifies on which node to execute the command. Default is
             to run the command on the deamon running on the local host.
           </p></dd><dt><span class="term">-Y</span></dt><dd><p>
@@ -20,11 +20,11 @@
             You only need to specify this parameter if you run multiple ctdb 
             daemons on the same physical host and thus can not use the default
             name for the domain socket.
-          </p></dd></dl></div></div><div class="refsect1" lang="en"><a name="id2488987"></a><h2>Administrative Commands</h2><p>
+          </p></dd></dl></div></div><div class="refsect1" lang="en"><a name="id2481127"></a><h2>Administrative Commands</h2><p>
       These are commands used to monitor and administrate a CTDB cluster.
-    </p><div class="refsect2" lang="en"><a name="id2488996"></a><h3>status</h3><p>
+    </p><div class="refsect2" lang="en"><a name="id2481136"></a><h3>status</h3><p>
         This command shows the current status of the ctdb node.
-      </p><div class="refsect3" lang="en"><a name="id2489005"></a><h4>node status</h4><p>
+      </p><div class="refsect3" lang="en"><a name="id2481145"></a><h4>node status</h4><p>
           Node status reflects the current status of the node. There are four possible states:
         </p><p>
           OK - This node is fully functional.
@@ -36,20 +36,20 @@
           UNHEALTHY - A service provided by this node is malfunctioning and should be investigated. The CTDB daemon itself is operational and participates in the cluster. Its public IP address has been taken over by a different node and no services are currnetly being hosted. All unhealthy nodes should be investigated and require an administrative action to rectify.
         </p><p>
           BANNED - This node failed too many recovery attempts and has been banned from participating in the cluster for a period of RecoveryBanPeriod seconds. Any public IP address has been taken over by other nodes. This node does not provide any services. All banned nodes should be investigated and require an administrative action to rectify. This node does not perticipate in the CTDB cluster but can still be communicated with. I.e. ctdb commands can be sent to it.
-        </p></div><div class="refsect3" lang="en"><a name="id2489056"></a><h4>generation</h4><p>
+        </p></div><div class="refsect3" lang="en"><a name="id2481197"></a><h4>generation</h4><p>
           The generation id is a number that indicates the current generation 
           of a cluster instance. Each time a cluster goes through a 
           reconfiguration or a recovery its generation id will be changed.
-        </p></div><div class="refsect3" lang="en"><a name="id2490202"></a><h4>VNNMAP</h4><p>
+        </p></div><div class="refsect3" lang="en"><a name="id2481210"></a><h4>VNNMAP</h4><p>
           The list of Virtual Node Numbers. This is a list of all nodes that actively participates in the cluster and that share the workload of hosting the Clustered TDB database records.
           Only nodes that are parcipitating in the vnnmap can become lmaster or dmaster for a database record.
-        </p></div><div class="refsect3" lang="en"><a name="id2490216"></a><h4>Recovery mode</h4><p>
+        </p></div><div class="refsect3" lang="en"><a name="id2481224"></a><h4>Recovery mode</h4><p>
           This is the current recovery mode of the cluster. There are two possible modes:
         </p><p>
           NORMAL - The cluster is fully operational.
         </p><p>
           RECOVERY - The cluster databases have all been frozen, pausing all services while the cluster awaits a recovery process to complete. A recovery process should finish within seconds. If a cluster is stuck in the RECOVERY state this would indicate a cluster malfunction which needs to be investigated.
-        </p></div><div class="refsect3" lang="en"><a name="id2490240"></a><h4>Recovery master</h4><p>
+        </p></div><div class="refsect3" lang="en"><a name="id2481248"></a><h4>Recovery master</h4><p>
           This is the cluster node that is currently designated as the recovery master. This node is responsible of monitoring the consistency of the cluster and to perform the actual recovery process when reqired.
         </p></div><p>
        Example: ctdb status
@@ -67,7 +67,7 @@ hash:2 lmaster:2
 hash:3 lmaster:3
 Recovery mode:NORMAL (0)
 Recovery master:0
-      </pre></div><div class="refsect2" lang="en"><a name="id2490271"></a><h3>ping</h3><p>
+      </pre></div><div class="refsect2" lang="en"><a name="id2481279"></a><h3>ping</h3><p>
         This command will "ping" all CTDB daemons in the cluster to verify that they are processing commands correctly.
       </p><p>
        Example: ctdb ping
@@ -78,7 +78,7 @@ response from 0 time=0.000054 sec  (3 clients)
 response from 1 time=0.000144 sec  (2 clients)
 response from 2 time=0.000105 sec  (2 clients)
 response from 3 time=0.000114 sec  (2 clients)
-      </pre></div><div class="refsect2" lang="en"><a name="id2490297"></a><h3>ip</h3><p>
+      </pre></div><div class="refsect2" lang="en"><a name="id2481305"></a><h3>ip</h3><p>
         This command will display the list of public addresses that are provided by the cluster and which physical node is currently serving this ip.
       </p><p>
        Example: ctdb ip
@@ -90,7 +90,7 @@ Number of nodes:4
 12.1.1.2         1
 12.1.1.3         2
 12.1.1.4         3
-      </pre></div><div class="refsect2" lang="en"><a name="id2490322"></a><h3>getvar &lt;name&gt;</h3><p>
+      </pre></div><div class="refsect2" lang="en"><a name="id2481330"></a><h3>getvar &lt;name&gt;</h3><p>
         Get the runtime value of a tuneable variable.
       </p><p>
        Example: ctdb getvar MaxRedirectCount
@@ -98,11 +98,11 @@ Number of nodes:4
        Example output:
       </p><pre class="screen">
 MaxRedirectCount    = 3
-      </pre></div><div class="refsect2" lang="en"><a name="id2490345"></a><h3>setvar &lt;name&gt; &lt;value&gt;</h3><p>
+      </pre></div><div class="refsect2" lang="en"><a name="id2528412"></a><h3>setvar &lt;name&gt; &lt;value&gt;</h3><p>
         Set the runtime value of a tuneable variable.
       </p><p>
        Example: ctdb setvar MaxRedirectCount 5
-      </p></div><div class="refsect2" lang="en"><a name="id2490360"></a><h3>listvars</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528427"></a><h3>listvars</h3><p>
         List all tuneable variables.
       </p><p>
        Example: ctdb listvars
@@ -124,7 +124,7 @@ MonitorInterval     = 15
 EventScriptTimeout  = 20
 RecoveryGracePeriod = 60
 RecoveryBanPeriod   = 300
-      </pre></div><div class="refsect2" lang="en"><a name="id2490388"></a><h3>statistics</h3><p>
+      </pre></div><div class="refsect2" lang="en"><a name="id2528455"></a><h3>statistics</h3><p>
         Collect statistics from the CTDB daemon about how many calls it has served.
       </p><p>
        Example: ctdb statistics
@@ -166,43 +166,43 @@ CTDB version 1
  max_hop_count                      0
  max_call_latency                   4.948321 sec
  max_lockwait_latency               0.000000 sec
-      </pre></div><div class="refsect2" lang="en"><a name="id2490432"></a><h3>statisticsreset</h3><p>
+      </pre></div><div class="refsect2" lang="en"><a name="id2528498"></a><h3>statisticsreset</h3><p>
         This command is used to clear all statistics counters in a node.
       </p><p>
        Example: ctdb statisticsreset
-      </p></div><div class="refsect2" lang="en"><a name="id2490445"></a><h3>getdebug</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528513"></a><h3>getdebug</h3><p>
         Get the current debug level for the node. the debug level controls what information is written to the log file.
-      </p></div><div class="refsect2" lang="en"><a name="id2490456"></a><h3>setdebug &lt;debuglevel&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528524"></a><h3>setdebug &lt;debuglevel&gt;</h3><p>
         Set the debug level of a node. This is a number between 0 and 9 and controls what information will be written to the logfile.
-      </p></div><div class="refsect2" lang="en"><a name="id2536582"></a><h3>getpid</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528535"></a><h3>getpid</h3><p>
         This command will return the process id of the ctdb daemon.
-      </p></div><div class="refsect2" lang="en"><a name="id2536592"></a><h3>disable</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528545"></a><h3>disable</h3><p>
         This command is used to administratively disable a node in the cluster.
         A disabled node will still participate in the cluster and host
         clustered TDB records but its public ip address has been taken over by
         a different node and it no longer hosts any services.
-      </p></div><div class="refsect2" lang="en"><a name="id2536611"></a><h3>enable</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528564"></a><h3>enable</h3><p>
         Re-enable a node that has been administratively disabled.
-      </p></div><div class="refsect2" lang="en"><a name="id2536621"></a><h3>ban &lt;bantime|0&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528574"></a><h3>ban &lt;bantime|0&gt;</h3><p>
         Administratively ban a node for bantime seconds. A bantime of 0 means that the node should be permanently banned. 
       </p><p>
         A banned node does not participate in the cluster and does not host any records for the clustered TDB. Its ip address has been taken over by an other node and no services are hosted.
       </p><p>
         Nodes are automatically banned if they are the cause of too many
         cluster recoveries.
-      </p></div><div class="refsect2" lang="en"><a name="id2536645"></a><h3>unban</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528598"></a><h3>unban</h3><p>
         This command is used to unban a node that has either been 
         administratively banned using the ban command or has been automatically
         banned by the recovery daemon.
-      </p></div><div class="refsect2" lang="en"><a name="id2536657"></a><h3>shutdown</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528610"></a><h3>shutdown</h3><p>
         This command will shutdown a specific CTDB daemon.
-      </p></div><div class="refsect2" lang="en"><a name="id2536667"></a><h3>recover</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528620"></a><h3>recover</h3><p>
         This command will trigger the recovery daemon to do a cluster
         recovery.
-      </p></div><div class="refsect2" lang="en"><a name="id2536677"></a><h3>killtcp &lt;srcip:port&gt; &lt;dstip:port&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528631"></a><h3>killtcp &lt;srcip:port&gt; &lt;dstip:port&gt;</h3><p>
         This command will kill the specified TCP connection by issuing a
         TCP RST to the srcip:port endpoint.
-      </p></div><div class="refsect2" lang="en"><a name="id2536689"></a><h3>tickle &lt;srcip:port&gt; &lt;dstip:port&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528642"></a><h3>tickle &lt;srcip:port&gt; &lt;dstip:port&gt;</h3><p>
         This command will will send a TCP tickle to the source host for the
         specified TCP connection.
        A TCP tickle is a TCP ACK packet with an invalid sequence and 
@@ -214,12 +214,12 @@ CTDB version 1
         TCP connection has been disrupted and that the client will need
         to reestablish. This greatly speeds up the time it takes for a client
         to detect and reestablish after an IP failover in the ctdb cluster.
-      </p></div></div><div class="refsect1" lang="en"><a name="id2536715"></a><h2>Debugging Commands</h2><p>
+      </p></div></div><div class="refsect1" lang="en"><a name="id2528668"></a><h2>Debugging Commands</h2><p>
       These commands are primarily used for CTDB development and testing and
       should not be used for normal administration.
-    </p><div class="refsect2" lang="en"><a name="id2536725"></a><h3>process-exists &lt;pid&gt;</h3><p>
+    </p><div class="refsect2" lang="en"><a name="id2528678"></a><h3>process-exists &lt;pid&gt;</h3><p>
         This command checks if a specific process exists on the CTDB host. This is mainly used by Samba to check if remote instances of samba are still running or not.
-      </p></div><div class="refsect2" lang="en"><a name="id2536737"></a><h3>getdbmap</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528691"></a><h3>getdbmap</h3><p>
         This command lists all clustered TDB databases that the CTDB daemon has attahced to.
       </p><p>
        Example: ctdb getdbmap
@@ -231,21 +231,21 @@ dbid:0x42fe72c5 name:locking.tdb path:/var/ctdb/locking.tdb.0
 dbid:0x1421fb78 name:brlock.tdb path:/var/ctdb/brlock.tdb.0
 dbid:0x17055d90 name:connections.tdb path:/var/ctdb/connections.tdb.0
 dbid:0xc0bdde6a name:sessionid.tdb path:/var/ctdb/sessionid.tdb.0
-      </pre></div><div class="refsect2" lang="en"><a name="id2536764"></a><h3>catdb &lt;dbname&gt;</h3><p>
+      </pre></div><div class="refsect2" lang="en"><a name="id2528718"></a><h3>catdb &lt;dbname&gt;</h3><p>
         This command will dump a clustered TDB database to the screen. This is a debugging command.
-      </p></div><div class="refsect2" lang="en"><a name="id2536775"></a><h3>getmonmode</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528729"></a><h3>getmonmode</h3><p>
         This command returns the monutoring mode of a node. The monitoring mode is either ACTIVE or DISABLED. Normally a node will continously monitor that all other nodes that are expected are in fact connected and that they respond to commands.
       </p><p>
         ACTIVE - This is the normal mode. The node is actively monitoring all other nodes, both that the transport is connected and also that the node responds to commands. If a node becomes unavailable, it will be marked as DISCONNECTED and a recovery is initiated to restore the cluster.
       </p><p>
         DISABLED - This node is not monitoring that other nodes are available. In this mode a node failure will not be detected and no recovery will be performed. This mode is useful when for debugging purposes one wants to attach GDB to a ctdb process but wants to prevent the rest of the cluster from marking this node as DISCONNECTED and do a recovery.
-      </p></div><div class="refsect2" lang="en"><a name="id2536806"></a><h3>setmonmode &lt;0|1&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528760"></a><h3>setmonmode &lt;0|1&gt;</h3><p>
         This command can be used to explicitely disable/enable monitoring mode on a node. The main purpose is if one wants to attach GDB to a running ctdb daemon but wants to prevent the other nodes from marking it as DISCONNECTED and issuing a recovery. To do this, set monitoring mode to 0 on all nodes before attaching with GDB. Remember to set monitoring mode back to 1 afterwards.
-      </p></div><div class="refsect2" lang="en"><a name="id2536821"></a><h3>attach &lt;dbname&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528776"></a><h3>attach &lt;dbname&gt;</h3><p>
         This is a debugging command. This command will make the CTDB daemon create a new CTDB database and attach to it.
-      </p></div><div class="refsect2" lang="en"><a name="id2536832"></a><h3>dumpmemory</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528787"></a><h3>dumpmemory</h3><p>
         This is a debugging command. This command will make the ctdb daemon to write a fill memory allocation map to the log file.
-      </p></div><div class="refsect2" lang="en"><a name="id2536844"></a><h3>freeze</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528798"></a><h3>freeze</h3><p>
         This command will lock all the local TDB databases causing clients 
         that are accessing these TDBs such as samba3 to block until the
         databases are thawed.
@@ -253,12 +253,12 @@ dbid:0xc0bdde6a name:sessionid.tdb path:/var/ctdb/sessionid.tdb.0
         This is primarily used by the recovery daemon to stop all samba
         daemons from accessing any databases while the database is recovered
         and rebuilt.
-      </p></div><div class="refsect2" lang="en"><a name="id2536862"></a><h3>thaw</h3><p>
+      </p></div><div class="refsect2" lang="en"><a name="id2528816"></a><h3>thaw</h3><p>
         Thaw a previously frozen node.
-      </p></div></div><div class="refsect1" lang="en"><a name="id2536873"></a><h2>SEE ALSO</h2><p>
+      </p></div></div><div class="refsect1" lang="en"><a name="id2528827"></a><h2>SEE ALSO</h2><p>
       ctdbd(1), onnode(1)
       <a href="http://ctdb.samba.org/" target="_top">http://ctdb.samba.org/</a>
-    </p></div><div class="refsect1" lang="en"><a name="id2536886"></a><h2>COPYRIGHT/LICENSE</h2><div class="literallayout"><p><br>
+    </p></div><div class="refsect1" lang="en"><a name="id2528840"></a><h2>COPYRIGHT/LICENSE</h2><div class="literallayout"><p><br>
 Copyright (C) Andrew Tridgell 2007<br>
 Copyright (C) Ronnie sahlberg 2007<br>
 <br>

diff --git a/ctdb/packaging/RPM/ctdb.spec b/ctdb/packaging/RPM/ctdb.spec
index 7d7ad53b1b66e6a0717940545a02a157aa853e72..e2e534d70b5cdf88eb37c4af9395ad17aa32bb66 100644 (file)
--- a/ctdb/packaging/RPM/ctdb.spec
+++ b/ctdb/packaging/RPM/ctdb.spec
@@ -97,8 +97,8 @@ fi
 %{_sysconfdir}/ctdb/events.d/10.interface
 %{_sysconfdir}/ctdb/events.d/40.vsftpd
 %{_sysconfdir}/ctdb/events.d/50.samba
-%{_sysconfdir}/ctdb/events.d/59.nfslock
 %{_sysconfdir}/ctdb/events.d/60.nfs
+%{_sysconfdir}/ctdb/events.d/61.nfstickle
 %{_sysconfdir}/ctdb/statd-callout
 %{_sbindir}/ctdbd
 %{_bindir}/ctdb