The branch, master has been updated
       via  1d7d7dd515e7ef62cacf2a712a2f4c4d62a38fa5 (commit)
       via  51aaed0e9e42e901451292e8dd545297ab725a62 (commit)
      from  9b395986962909a5b0548eaea7e45215df72a08e (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1d7d7dd515e7ef62cacf2a712a2f4c4d62a38fa5
Author: Ronnie Sahlberg <ronniesahlb...@gmail.com>
Date:   Tue Jul 28 13:54:08 2009 +1000

    document the two new commands setlmasterrole and setrecmasterrole

commit 51aaed0e9e42e901451292e8dd545297ab725a62
Author: Ronnie Sahlberg <ronniesahlb...@gmail.com>
Date:   Tue Jul 28 13:45:13 2009 +1000

    add two commands : setlmasterrole and setrecmasterrole to enable/disable 
these capabilities at runtime

-----------------------------------------------------------------------

Summary of changes:
 client/ctdb_client.c   |   46 +++++++++++++++++++++
 doc/ctdb.1             |   21 ++++++++--
 doc/ctdb.1.html        |  104 ++++++++++++++++++++++++++---------------------
 doc/ctdb.1.xml         |   37 ++++++++++++++---
 doc/ctdbd.1            |   18 +-------
 doc/ctdbd.1.html       |   84 ++++++++++++++++----------------------
 doc/ctdbd.1.xml        |   38 -----------------
 include/ctdb.h         |    2 +
 include/ctdb_private.h |    2 +
 server/ctdb_control.c  |   26 ++++++++++++
 tools/ctdb.c           |   62 ++++++++++++++++++++++++++++-
 11 files changed, 278 insertions(+), 162 deletions(-)


Changeset truncated at 500 lines:

diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index a48e529..7062fa7 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -3764,3 +3764,49 @@ int ctdb_ctrl_setnatgwstate(struct ctdb_context *ctdb, 
struct timeval timeout, u
 
        return 0;
 }
+
+/*
+  set the lmaster role for a node
+ */
+int ctdb_ctrl_setlmasterrole(struct ctdb_context *ctdb, struct timeval 
timeout, uint32_t destnode, uint32_t lmasterrole)
+{
+       int ret;
+       TDB_DATA data;
+       int32_t res;
+
+       data.dsize = sizeof(lmasterrole);
+       data.dptr  = (uint8_t *)&lmasterrole;
+
+       ret = ctdb_control(ctdb, destnode, 0, 
+                          CTDB_CONTROL_SET_LMASTERROLE, 0, data, 
+                          NULL, NULL, &res, &timeout, NULL);
+       if (ret != 0 || res != 0) {
+               DEBUG(DEBUG_ERR,(__location__ " ctdb_control for setlmasterrole 
failed\n"));
+               return -1;
+       }
+
+       return 0;
+}
+
+/*
+  set the recmaster role for a node
+ */
+int ctdb_ctrl_setrecmasterrole(struct ctdb_context *ctdb, struct timeval 
timeout, uint32_t destnode, uint32_t recmasterrole)
+{
+       int ret;
+       TDB_DATA data;
+       int32_t res;
+
+       data.dsize = sizeof(recmasterrole);
+       data.dptr  = (uint8_t *)&recmasterrole;
+
+       ret = ctdb_control(ctdb, destnode, 0, 
+                          CTDB_CONTROL_SET_RECMASTERROLE, 0, data, 
+                          NULL, NULL, &res, &timeout, NULL);
+       if (ret != 0 || res != 0) {
+               DEBUG(DEBUG_ERR,(__location__ " ctdb_control for 
setrecmasterrole failed\n"));
+               return -1;
+       }
+
+       return 0;
+}
diff --git a/doc/ctdb.1 b/doc/ctdb.1
index e56f997..ab487d9 100644
--- a/doc/ctdb.1
+++ b/doc/ctdb.1
@@ -340,9 +340,7 @@ This command shows the capabilities of the current node\. 
Please see manpage for
 .PP
 RECMASTER and LMASTER capabilities are primarily used when CTDBD is used to 
create a cluster spanning across WAN links\. In which case ctdbd acts as a WAN 
accelerator\.
 .PP
-LVS capability means that the node is participating in LVS, a mode where the 
entire CTDB cluster uses one single ip address for the entire cluster instead 
of using public ip address failover\. This is an alternative to using a 
loadbalancing layer\-4 switch\.
-.PP
-NATGW capability means that the node participates in a NATGW group\. This flag 
can be modified using "ctdb setnatgwstate {on|off}"
+LVS capabile means that the node is participating in LVS, a mode where the 
entire CTDB cluster uses one single ip address for the entire cluster instead 
of using public ip address failover\. This is an alternative to using a 
loadbalancing layer\-4 switch\.
 .PP
 Example output:
 .sp
@@ -351,7 +349,6 @@ Example output:
 RECMASTER: YES
 LMASTER: YES
 LVS: NO
-NATGW: NO
       
 .fi
 .RE
@@ -484,6 +481,22 @@ This command will trigger the recovery daemon to do a 
cluster recovery\.
 .SS "ipreallocate"
 .PP
 This command will force the recovery master to perform a full ip reallocation 
process and redistribute all ip addresses\. This is useful to "reset" the 
allocations back to its default state if they have been changed using the 
"moveip" command\. While a "recover" will also perform this reallocation, a 
recovery is much more hevyweight since it will also rebuild all the databases\.
+.SS "setlmasterrole <on|off>"
+.PP
+This command is used ot enable/disable the LMASTER capability for a node at 
runtime\. This capability determines whether or not a node can be used as an 
LMASTER for records in the database\. A node that does not have the LMASTER 
capability will not show up in the vnnmap\.
+.PP
+Nodes will by default have this capability, but it can be stripped off nodes 
by the setting in the sysconfig file or by using this command\.
+.PP
+Once this setting has been enabled/disabled, you need to perform a recovery 
for it to take effect\.
+.PP
+See also "ctdb getcapabilities"
+.SS "setrecmasterrole <on|off>"
+.PP
+This command is used ot enable/disable the RECMASTER capability for a node at 
runtime\. This capability determines whether or not a node can be used as an 
RECMASTER for the cluster\. A node that does not have the RECMASTER capability 
can not win a recmaster election\. A node that already is the recmaster for the 
cluster when the capability is stripped off the node will remain the recmaster 
until the next cluster election\.
+.PP
+Nodes will by default have this capability, but it can be stripped off nodes 
by the setting in the sysconfig file or by using this command\.
+.PP
+See also "ctdb getcapabilities"
 .SS "killtcp <srcip:port> <dstip:port>"
 .PP
 This command will kill the specified TCP connection by issuing a TCP RST to 
the srcip:port endpoint\. This is a command used by the ctdb eventscripts\.
diff --git a/doc/ctdb.1.html b/doc/ctdb.1.html
index b135986..535f255 100644
--- a/doc/ctdb.1.html
+++ b/doc/ctdb.1.html
@@ -246,21 +246,17 @@ RecoveryBanPeriod   = 300
       is used to create a cluster spanning across WAN links. In which case
       ctdbd acts as a WAN accelerator.
       </p><p>
-      LVS capability means that the node is participating in LVS, a mode
+      LVS capabile means that the node is participating in LVS, a mode
       where the entire CTDB cluster uses one single ip address for the
       entire cluster instead of using public ip address failover.
       This is an alternative to using a loadbalancing layer-4 switch.
       </p><p>
-      NATGW capability means that the node participates in a NATGW group.
-      This flag can be modified using "ctdb setnatgwstate {on|off}"
-      </p><p>
        Example output:
       </p><pre class="screen">
 RECMASTER: YES
 LMASTER: YES
 LVS: NO
-NATGW: NO
-      </pre></div><div class="refsect2" lang="en"><a 
name="id2528716"></a><h3>statistics</h3><p>
+      </pre></div><div class="refsect2" lang="en"><a 
name="id2528709"></a><h3>statistics</h3><p>
         Collect statistics from the CTDB daemon about how many calls it has 
served.
       </p><p>
        Example: ctdb statistics
@@ -302,23 +298,23 @@ 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="id2528759"></a><h3>statisticsreset</h3><p>
+      </pre></div><div class="refsect2" lang="en"><a 
name="id2528753"></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="id2528773"></a><h3>getreclock</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2528767"></a><h3>getreclock</h3><p>
        This command is used to show the filename of the reclock file that is 
used.
       </p><p>
        Example output:
       </p><pre class="screen">
 Reclock file:/gpfs/.ctdb/shared
-      </pre></div><div class="refsect2" lang="en"><a 
name="id2528793"></a><h3>setreclock [filename]</h3><p>
+      </pre></div><div class="refsect2" lang="en"><a 
name="id2528787"></a><h3>setreclock [filename]</h3><p>
        This command is used to modify, or clear, the file that is used as the 
reclock file at runtime. When this command is used, the reclock file checks are 
disabled. To re-enable the checks the administrator needs to activate the 
"VerifyRecoveryLock" tunable using "ctdb setvar".
       </p><p>
        If run with no parameter this will remove the reclock file completely. 
If run with a parameter the parameter specifies the new filename to use for the 
recovery lock.
       </p><p>
        This command only affects the runtime settings of a ctdb node and will 
be lost when ctdb is restarted. For persistent changes to the reclock file 
setting you must edit /etc/sysconfig/ctdb.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2528820"></a><h3>getdebug</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2528813"></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><p>
        The debug levels are mapped to the corresponding syslog levels.
@@ -328,42 +324,42 @@ Reclock file:/gpfs/.ctdb/shared
        The list of debug levels from highest to lowest are :
       </p><p>
        EMERG ALERT CRIT ERR WARNING NOTICE INFO DEBUG
-      </p></div><div class="refsect2" lang="en"><a 
name="id2528845"></a><h3>setdebug &lt;debuglevel&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2528839"></a><h3>setdebug &lt;debuglevel&gt;</h3><p>
         Set the debug level of a node. This controls what information will be 
logged.
       </p><p>
        The debuglevel is one of EMERG ALERT CRIT ERR WARNING NOTICE INFO DEBUG
-      </p></div><div class="refsect2" lang="en"><a 
name="id2528861"></a><h3>getpid</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2528855"></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="id2528871"></a><h3>disable</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2528865"></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="id2528885"></a><h3>enable</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2528879"></a><h3>enable</h3><p>
         Re-enable a node that has been administratively disabled.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2528895"></a><h3>stop</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2528889"></a><h3>stop</h3><p>
         This command is used to administratively STOP a node in the cluster.
         A STOPPED node is connected to the cluster but will not host any
        public ip addresse, nor does it participate in the VNNMAP.
        The difference between a DISABLED node and a STOPPED node is that
        a STOPPED node does not host any parts of the database which means
        that a recovery is required to stop/continue nodes.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2528911"></a><h3>continue</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2528905"></a><h3>continue</h3><p>
         Re-start a node that has been administratively stopped.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2528921"></a><h3>addip &lt;public_ip/mask&gt; &lt;iface&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2528915"></a><h3>addip &lt;public_ip/mask&gt; &lt;iface&gt;</h3><p>
        This command is used to add a new public ip to a node during runtime.
        This allows public addresses to be added to a cluster without having
        to restart the ctdb daemons.
       </p><p>
        Note that this only updates the runtime instance of ctdb. Any changes 
will be lost next time ctdb is restarted and the public addresses file is 
re-read.
  If you want this change to be permanent you must also update the public 
addresses file manually.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2528941"></a><h3>delip &lt;public_ip&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2528935"></a><h3>delip &lt;public_ip&gt;</h3><p>
        This command is used to remove a public ip from a node during runtime.
        If this public ip is currently hosted by the node it being removed 
from, the ip will first be failed over to another node, if possible, before it 
is removed.
       </p><p>
        Note that this only updates the runtime instance of ctdb. Any changes 
will be lost next time ctdb is restarted and the public addresses file is 
re-read.
  If you want this change to be permanent you must also update the public 
addresses file manually.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2528962"></a><h3>moveip &lt;public_ip&gt; &lt;node&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2528956"></a><h3>moveip &lt;public_ip&gt; &lt;node&gt;</h3><p>
       This command can be used to manually fail a public ip address to a
       specific node.
       </p><p>
@@ -374,22 +370,36 @@ Reclock file:/gpfs/.ctdb/shared
       DeterministicIPs = 0
       </p><p>
       NoIPFailback = 1
-      </p></div><div class="refsect2" lang="en"><a 
name="id2528987"></a><h3>shutdown</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2528981"></a><h3>shutdown</h3><p>
         This command will shutdown a specific CTDB daemon.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2528997"></a><h3>recover</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2528991"></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="id2529007"></a><h3>ipreallocate</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529001"></a><h3>ipreallocate</h3><p>
         This command will force the recovery master to perform a full ip 
reallocation process and redistribute all ip addresses. This is useful to 
"reset" the allocations back to its default state if they have been changed 
using the "moveip" command. While a "recover" will also perform this 
reallocation, a recovery is much more hevyweight since it will also rebuild all 
the databases.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2529023"></a><h3>killtcp &lt;srcip:port&gt; &lt;dstip:port&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529017"></a><h3>setlmasterrole &lt;on|off&gt;</h3><p>
+       This command is used ot enable/disable the LMASTER capability for a 
node at runtime. This capability determines whether or not a node can be used 
as an LMASTER for records in the database. A node that does not have the 
LMASTER capability will not show up in the vnnmap.
+      </p><p>
+       Nodes will by default have this capability, but it can be stripped off 
nodes by the setting in the sysconfig file or by using this command.
+      </p><p>
+       Once this setting has been enabled/disabled, you need to perform a 
recovery for it to take effect.
+      </p><p>
+       See also "ctdb getcapabilities"
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529046"></a><h3>setrecmasterrole &lt;on|off&gt;</h3><p>
+       This command is used ot enable/disable the RECMASTER capability for a 
node at runtime. This capability determines whether or not a node can be used 
as an RECMASTER for the cluster. A node that does not have the RECMASTER 
capability can not win a recmaster election. A node that already is the 
recmaster for the cluster when the capability is stripped off the node will 
remain the recmaster until the next cluster election.
+      </p><p>
+       Nodes will by default have this capability, but it can be stripped off 
nodes by the setting in the sysconfig file or by using this command.
+      </p><p>
+       See also "ctdb getcapabilities"
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529072"></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. This is a command used by the 
        ctdb eventscripts.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2529035"></a><h3>gratiousarp &lt;ip&gt; &lt;interface&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529085"></a><h3>gratiousarp &lt;ip&gt; &lt;interface&gt;</h3><p>
        This command will send out a gratious arp for the specified interface
        through the specified interface. This command is mainly used by the
        ctdb eventscripts.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2529048"></a><h3>reloadnodes</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529097"></a><h3>reloadnodes</h3><p>
       This command is used when adding new nodes, or removing existing nodes 
from an existing cluster.
       </p><p>
       Procedure to add a node:
@@ -423,7 +433,7 @@ Reclock file:/gpfs/.ctdb/shared
       </p><p>
       5, Use 'ctdb status' on all nodes and verify that the deleted node no 
longer shows up in the list..
       </p><p>
-      </p></div><div class="refsect2" lang="en"><a 
name="id2529132"></a><h3>tickle &lt;srcip:port&gt; &lt;dstip:port&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529181"></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 
@@ -435,10 +445,10 @@ Reclock file:/gpfs/.ctdb/shared
         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 class="refsect2" lang="en"><a 
name="id2529157"></a><h3>gettickles &lt;ip&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529206"></a><h3>gettickles &lt;ip&gt;</h3><p>
        This command is used to show which TCP connections are registered with
        CTDB to be "tickled" if there is a failover.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2529168"></a><h3>repack [max_freelist]</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529217"></a><h3>repack [max_freelist]</h3><p>
        Over time, when records are created and deleted in a TDB, the TDB list 
of free space will become fragmented. This can lead to a slowdown in accessing 
TDB records.
        This command is used to defragment a TDB database and pruning the 
freelist.
       </p><p>
@@ -453,7 +463,7 @@ Reclock file:/gpfs/.ctdb/shared
        Example: ctdb repack 1000
       </p><p>
         By default, this operation is issued from the 00.ctdb event script 
every 5 minutes.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2529214"></a><h3>vacuum [max_records]</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529264"></a><h3>vacuum [max_records]</h3><p>
        Over time CTDB databases will fill up with empty deleted records which 
will lead to a progressive slow down of CTDB database access.
        This command is used to prune all databases and delete all empty 
records from the cluster.
       </p><p>
@@ -469,17 +479,17 @@ Reclock file:/gpfs/.ctdb/shared
        Example: ctdb vacuum
       </p><p>
         By default, this operation is issued from the 00.ctdb event script 
every 5 minutes.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2529250"></a><h3>backupdb &lt;database&gt; &lt;file&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529299"></a><h3>backupdb &lt;database&gt; &lt;file&gt;</h3><p>
         This command can be used to copy the entire content of a database out 
to a file. This file can later be read back into ctdb using the restoredb 
command.
 This is mainly useful for backing up persistent databases such as secrets.tdb 
and similar.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2529264"></a><h3>restoredb &lt;file&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529313"></a><h3>restoredb &lt;file&gt;</h3><p>
         This command restores a persistent database that was previously backed 
up using backupdb.
-      </p></div></div><div class="refsect1" lang="en"><a 
name="id2529276"></a><h2>Debugging Commands</h2><p>
+      </p></div></div><div class="refsect1" lang="en"><a 
name="id2529325"></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="id2529286"></a><h3>process-exists &lt;pid&gt;</h3><p>
+    </p><div class="refsect2" lang="en"><a 
name="id2529336"></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="id2529298"></a><h3>getdbmap</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529348"></a><h3>getdbmap</h3><p>
         This command lists all clustered TDB databases that the CTDB daemon 
has attached to. Some databases are flagged as PERSISTENT, this means that the 
database stores data persistently and the data will remain across reboots. One 
example of such a database is secrets.tdb where information about how the 
cluster was joined to the domain is stored.
        </p><p>
        Most databases are not persistent and only store the state information 
that the currently running samba daemons need. These databases are always wiped 
when ctdb/samba starts and when a node is rebooted.
@@ -498,25 +508,25 @@ dbid:0x2672a57f name:idmap2.tdb 
path:/var/ctdb/persistent/idmap2.tdb.0 PERSISTEN
 dbid:0xb775fff6 name:secrets.tdb path:/var/ctdb/persistent/secrets.tdb.0 
PERSISTENT
 dbid:0xe98e08b6 name:group_mapping.tdb 
path:/var/ctdb/persistent/group_mapping.tdb.0 PERSISTENT
 dbid:0x7bbbd26c name:passdb.tdb path:/var/ctdb/persistent/passdb.tdb.0 
PERSISTENT
-      </pre></div><div class="refsect2" lang="en"><a 
name="id2529345"></a><h3>catdb &lt;dbname&gt;</h3><p>
+      </pre></div><div class="refsect2" lang="en"><a 
name="id2529394"></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="id2529356"></a><h3>getmonmode</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529405"></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="id2529386"></a><h3>setmonmode &lt;0|1&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529436"></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="id2529402"></a><h3>attach &lt;dbname&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529451"></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="id2529413"></a><h3>dumpmemory</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529463"></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 standard output.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2529425"></a><h3>rddumpmemory</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529474"></a><h3>rddumpmemory</h3><p>
         This is a debugging command. This command will dump the talloc memory
        allocation tree for the recovery daemon to standard output.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2529436"></a><h3>freeze</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529486"></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.
@@ -524,26 +534,26 @@ dbid:0x7bbbd26c name:passdb.tdb 
path:/var/ctdb/persistent/passdb.tdb.0 PERSISTEN
         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="id2529454"></a><h3>thaw</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529504"></a><h3>thaw</h3><p>
         Thaw a previously frozen node.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2529464"></a><h3>eventscript &lt;arguments&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529514"></a><h3>eventscript &lt;arguments&gt;</h3><p>
         This is a debugging command. This command can be used to manually
        invoke and run the eventscritps with arbitrary arguments.
-      </p></div><div class="refsect2" lang="en"><a 
name="id2529476"></a><h3>ban &lt;bantime|0&gt;</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529525"></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="id2529499"></a><h3>unban</h3><p>
+      </p></div><div class="refsect2" lang="en"><a 
name="id2529549"></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><div class="refsect1" lang="en"><a 
name="id2529512"></a><h2>SEE ALSO</h2><p>
+      </p></div></div><div class="refsect1" lang="en"><a 
name="id2529562"></a><h2>SEE ALSO</h2><p>
       ctdbd(1), onnode(1)
       <a class="ulink" href="http://ctdb.samba.org/"; 
target="_top">http://ctdb.samba.org/</a>
-    </p></div><div class="refsect1" lang="en"><a 
name="id2529525"></a><h2>COPYRIGHT/LICENSE</h2><div 
class="literallayout"><p><br>
+    </p></div><div class="refsect1" lang="en"><a 
name="id2476130"></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/doc/ctdb.1.xml b/doc/ctdb.1.xml
index 9c6c9fc..aa5981f 100644
--- a/doc/ctdb.1.xml
+++ b/doc/ctdb.1.xml
@@ -472,25 +472,19 @@ RecoveryBanPeriod   = 300
       </para>
 
       <para>
-      LVS capability means that the node is participating in LVS, a mode
+      LVS capabile means that the node is participating in LVS, a mode
       where the entire CTDB cluster uses one single ip address for the
       entire cluster instead of using public ip address failover.
       This is an alternative to using a loadbalancing layer-4 switch.
       </para>
 
       <para>
-      NATGW capability means that the node participates in a NATGW group.
-      This flag can be modified using "ctdb setnatgwstate {on|off}"
-      </para>
-
-      <para>
        Example output:
       </para>
       <screen format="linespecific">
 RECMASTER: YES
 LMASTER: YES
 LVS: NO
-NATGW: NO
       </screen>
 
     </refsect2>
@@ -707,6 +701,35 @@ Reclock file:/gpfs/.ctdb/shared
       </para>
     </refsect2>
 
+    <refsect2><title>setlmasterrole &lt;on|off&gt;</title>
+      <para>
+       This command is used ot enable/disable the LMASTER capability for a 
node at runtime. This capability determines whether or not a node can be used 
as an LMASTER for records in the database. A node that does not have the 
LMASTER capability will not show up in the vnnmap.
+      </para>
+
+      <para>
+       Nodes will by default have this capability, but it can be stripped off 
nodes by the setting in the sysconfig file or by using this command.
+      </para>
+      <para>
+       Once this setting has been enabled/disabled, you need to perform a 
recovery for it to take effect.
+      </para>
+      <para>
+       See also "ctdb getcapabilities"
+      </para>
+    </refsect2>
+
+    <refsect2><title>setrecmasterrole &lt;on|off&gt;</title>
+      <para>
+       This command is used ot enable/disable the RECMASTER capability for a 
node at runtime. This capability determines whether or not a node can be used 
as an RECMASTER for the cluster. A node that does not have the RECMASTER 
capability can not win a recmaster election. A node that already is the 
recmaster for the cluster when the capability is stripped off the node will 
remain the recmaster until the next cluster election.
+      </para>
+
+      <para>
+       Nodes will by default have this capability, but it can be stripped off 
nodes by the setting in the sysconfig file or by using this command.
+      </para>
+      <para>
+       See also "ctdb getcapabilities"
+      </para>
+    </refsect2>
+
     <refsect2><title>killtcp &lt;srcip:port&gt; &lt;dstip:port&gt;</title>
       <para>
         This command will kill the specified TCP connection by issuing a
diff --git a/doc/ctdbd.1 b/doc/ctdbd.1
index 4fbb5e7..242bd45 100644
--- a/doc/ctdbd.1
+++ b/doc/ctdbd.1
@@ -1,11 +1,11 @@
 .\"     Title: ctdbd
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\"      Date: 07/28/2009
+.\"      Date: 07/09/2009
 .\"    Manual: 
 .\"    Source: 
 .\"
-.TH "CTDBD" "1" "07/28/2009" "" ""
+.TH "CTDBD" "1" "07/09/2009" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -508,20 +508,6 @@ The NAT\-GW node is assigned the CTDB_NATGW_PUBLIC_IP to 
the designated interfac
 All other nodes in the group are configured with a default route of metric 10 
pointing to the designated NAT GW node\.
 .PP
 This is implemented in the 11\.natgw eventscript\. Please see the eventscript 
for further information\.
-.SS "Activating NATGW without forcing a cluster restart"
-.PP
-Normally you would update the configuration and restart the nodes to activate 
NATGW\. It is however also possible to manually start NATGW without restarting 
CTDB, but it does require a recovery\.
-.PP
-To activate NATGW functionality on a cluster without restarting the actual 
nodes you can use the following process :
-.PP
-Activating NATGW on a running system
-.RS 4
-Configure NATGW as described above on all nodes\.
-Run "echo 3 > /proc/sys/net/ipv4/conf/all/arp_ignore" on all nodes\.
-Run "echo 2 > /proc/sys/net/ipv4/conf/all/arp_announce" on all nodes\.
-Run "ctdb setnatgwstate on" on all nodes\.
-Force a recovery by running "ctdb recover"\.
-.RE
 .SH "CLAMAV DAEMON"
 .PP
 CTDB has support to manage the popular anti\-virus daemon ClamAV\. This 
support is implemented through the eventscript : /etc/ctdb/events\.d/31\.clamd\.
diff --git a/doc/ctdbd.1.html b/doc/ctdbd.1.html
index 0118ca0..3fa8d1a 100644
--- a/doc/ctdbd.1.html
+++ b/doc/ctdbd.1.html
@@ -1,4 +1,4 @@
-<html><head><meta http-equiv="Content-Type" content="text/html; 
charset=ISO-8859-1"><title>ctdbd</title><meta name="generator" content="DocBook 
XSL Stylesheets V1.73.2"></head><body bgcolor="white" text="black" 
link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" 
lang="en"><a name="ctdbd.1"></a><div class="titlepage"></div><div 
class="refnamediv"><h2>Name</h2><p>ctdbd &#8212; The CTDB cluster 
daemon</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div 
class="cmdsynopsis"><p><code class="command">ctdbd</code> </p></div><div 
class="cmdsynopsis"><p><code class="command">ctdbd</code>  [-? --help] [-d 
--debug=&lt;INTEGER&gt;] {--dbdir=&lt;directory&gt;} 
{--dbdir-persistent=&lt;directory&gt;} [--event-script-dir=&lt;directory&gt;] 
[-i --interactive] [--listen=&lt;address&gt;] [--logfile=&lt;filename&gt;] 
[--lvs] {--nlist=&lt;filename&gt;} [--no-lmaster] [--no-recmaster] 
[--nosetsched] [--public-addresses=&lt;filename&gt;] 
[--public-interface=&lt;interface&gt;
 ] {--reclock=&lt;filename&gt;} [--single-public-ip=&lt;address&gt;] 
[--socket=&lt;filename&gt;] [--start-as-disabled] [--start-as-stopped] 
[--syslog] [--torture] [--transport=&lt;STRING&gt;] 
[--usage]</p></div></div><div class="refsect1" lang="en"><a 
name="id2478383"></a><h2>DESCRIPTION</h2><p>
+<html><head><meta http-equiv="Content-Type" content="text/html; 
charset=ISO-8859-1"><title>ctdbd</title><meta name="generator" content="DocBook 
XSL Stylesheets V1.73.2"></head><body bgcolor="white" text="black" 
link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" 
lang="en"><a name="ctdbd.1"></a><div class="titlepage"></div><div 
class="refnamediv"><h2>Name</h2><p>ctdbd &#8212; The CTDB cluster 
daemon</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div 
class="cmdsynopsis"><p><code class="command">ctdbd</code> </p></div><div 
class="cmdsynopsis"><p><code class="command">ctdbd</code>  [-? --help] [-d 
--debug=&lt;INTEGER&gt;] {--dbdir=&lt;directory&gt;} 
{--dbdir-persistent=&lt;directory&gt;} [--event-script-dir=&lt;directory&gt;] 
[-i --interactive] [--listen=&lt;address&gt;] [--logfile=&lt;filename&gt;] 
[--lvs] {--nlist=&lt;filename&gt;} [--no-lmaster] [--no-recmaster] 
[--nosetsched] [--public-addresses=&lt;filename&gt;] 
[--public-interface=&lt;interface&gt;
 ] {--reclock=&lt;filename&gt;} [--single-public-ip=&lt;address&gt;] 
[--socket=&lt;filename&gt;] [--start-as-disabled] [--start-as-stopped] 
[--syslog] [--torture] [--transport=&lt;STRING&gt;] 
[--usage]</p></div></div><div class="refsect1" lang="en"><a 
name="id2479655"></a><h2>DESCRIPTION</h2><p>
       ctdbd is the main ctdb daemon.
     </p><p>
       ctdbd provides a clustered version of the TDB database with automatic 
rebuild/recovery of the databases upon nodefailures.
@@ -8,7 +8,7 @@
       ctdbd provides monitoring of all nodes in the cluster and automatically 
reconfigures the cluster and recovers upon node failures.
     </p><p>
       ctdbd is the main component in clustered Samba that provides a 
high-availability load-sharing CIFS server cluster.
-    </p></div><div class="refsect1" lang="en"><a 
name="id2478416"></a><h2>OPTIONS</h2><div class="variablelist"><dl><dt><span 
class="term">-? --help</span></dt><dd><p>
+    </p></div><div class="refsect1" lang="en"><a 
name="id2479687"></a><h2>OPTIONS</h2><div class="variablelist"><dl><dt><span 
class="term">-? --help</span></dt><dd><p>
             Print some help text to the screen.
           </p></dd><dt><span class="term">-d 
--debug=&lt;DEBUGLEVEL&gt;</span></dt><dd><p>
             This option sets the debuglevel on the ctdbd daemon which controls 
what will be written to the logfile. The default is 0 which will only log 
important events and errors. A larger number will provide additional logging.
@@ -129,10 +129,10 @@
            implemented in the future.
           </p></dd><dt><span class="term">--usage</span></dt><dd><p>
             Print useage information to the screen.


-- 
CTDB repository

Reply via email to