[SCM] CTDB repository - branch 1.2.40 updated - ctdb-1.2.55-7-g699aaf7

Amitay Isaacs amitay at samba.org
Tue Jan 1 22:13:49 MST 2013


The branch, 1.2.40 has been updated
       via  699aaf7b3e65e9e31dd45bf407236d86c86782cc (commit)
       via  8647b27d58e8ef3323a58269c911c8dbfe100164 (commit)
       via  2395b2013972bdc8621978e26f92a8181742037b (commit)
       via  f5944ff7d78c0cd3e2ee010c72f5b3f5e20cb013 (commit)
       via  8e6171b5355041a7062d8fd877569a85e7c14301 (commit)
      from  0e99ca1cdf28a7043554afb78bd439f727ab4f95 (commit)

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


- Log -----------------------------------------------------------------
commit 699aaf7b3e65e9e31dd45bf407236d86c86782cc
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Wed Jan 2 15:49:39 2013 +1100

    daemon: Change the default recovery method for persistent databases
    
    Use sequence numbers to do the recovery for persistent databases instead
    of RSNs.  This fixes the problem of registry corrpution during recovery.
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>

commit 8647b27d58e8ef3323a58269c911c8dbfe100164
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Nov 30 08:59:03 2011 +1100

    DOC: describe the RecoverPDBBySeqNum tunable
    
    Conflicts:
    	doc/ctdbd.1
    	doc/ctdbd.1.html
    
    Cherry-pick-from: 86d956170d4806065f1470fc44710c085c57f17a

commit 2395b2013972bdc8621978e26f92a8181742037b
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Nov 28 13:56:30 2011 +1100

    Recover Persistent database DB by DB and not record by record
    
    Add a new tunable that changes the mode how persistent databases are recovered.
    RecoveryPDBBySeqNum
    
    When set to 1, persistent databases will be recovered in whole from the node which
    has the highest "__db_sequence_number__" record.
    This record is managed by samba for those databases where we do persistent writes and have
    inter-record relations.
    For these databases we do not want the usual "blend records from all nodes based
    on individual record RSN" but instead a mode where we pick one instance of the persistent database.
    
    If no node was found with a "__db_sequence_number__" record at all, we fail back to the original "recover records independently based on record RSN".
    Some persistent databases do not contain record interrelations and as such does not
    contain this special record at all.
    
    Conflicts:
    	include/ctdb_private.h
    	server/ctdb_tunables.c
    
    Cherry-pick-from: 502150c764298a9fa8c4d8aa445bf7d85d4ee9dc

commit f5944ff7d78c0cd3e2ee010c72f5b3f5e20cb013
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Nov 28 16:30:46 2011 +1100

    LibCTDB: add get persistent db seqnum control
    
    Conflicts:
    	tools/ctdb.c
    
    Cherry-pick-from: 6e96a62494bbb2c7b0682ebf0c2115dd2f44f7af

commit 8e6171b5355041a7062d8fd877569a85e7c14301
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Mon Nov 28 10:41:17 2011 +1100

    DB Seqnum: must provide a ctdb_ltdb_header when calling ctdb_ltdb_fetch()
    
    Cherry-pick-from: 1fea9ef55a6a9d201ad1b49583451ac3e6b1c66d

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

Summary of changes:
 doc/ctdb.1               |   37 ++++++++-----
 doc/ctdbd.1              |   13 ++++-
 doc/ctdbd.1.html         |   92 +++++++++++++++++++---------------
 doc/ctdbd.1.xml          |   21 ++++++++
 include/ctdb.h           |   52 +++++++++++++++++++
 include/ctdb_private.h   |    1 +
 libctdb/control.c        |   40 +++++++++++++++
 libctdb/sync.c           |   18 +++++++
 server/ctdb_persistent.c |    3 +-
 server/ctdb_recoverd.c   |  126 ++++++++++++++++++++++++++++++++++++++++++++-
 server/ctdb_tunables.c   |    3 +-
 tools/ctdb.c             |   27 ++++++++++
 12 files changed, 372 insertions(+), 61 deletions(-)


Changeset truncated at 500 lines:

diff --git a/doc/ctdb.1 b/doc/ctdb.1
index 70e150c..3b15032 100644
--- a/doc/ctdb.1
+++ b/doc/ctdb.1
@@ -1,13 +1,22 @@
 '\" t
 .\"     Title: ctdb
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.1 <http://docbook.sf.net/>
-.\"      Date: 08/05/2010
+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
+.\"      Date: 01/02/2013
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDB" "1" "08/05/2010" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDB" "1" "01/02/2013" "ctdb" "CTDB \- clustered TDB database"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -407,12 +416,12 @@ Example output:
 .PP
 This command is used to disable an eventscript\&.
 .PP
-This will take effect the next time the eventscripts are being executed so it can take a short while until this is reflected in \'scriptstatus\'\&.
+This will take effect the next time the eventscripts are being executed so it can take a short while until this is reflected in \*(Aqscriptstatus\*(Aq\&.
 .SS "enablescript <script>"
 .PP
 This command is used to enable an eventscript\&.
 .PP
-This will take effect the next time the eventscripts are being executed so it can take a short while until this is reflected in \'scriptstatus\'\&.
+This will take effect the next time the eventscripts are being executed so it can take a short while until this is reflected in \*(Aqscriptstatus\*(Aq\&.
 .SS "getvar <name>"
 .PP
 Get the runtime value of a tuneable variable\&.
@@ -706,29 +715,29 @@ This command is used when adding new nodes, or removing existing nodes from an e
 .PP
 Procedure to add a node:
 .PP
-1, To expand an existing cluster, first ensure with \'ctdb status\' that all nodes are up and running and that they are all healthy\&. Do not try to expand a cluster unless it is completely healthy!
+1, To expand an existing cluster, first ensure with \*(Aqctdb status\*(Aq that all nodes are up and running and that they are all healthy\&. Do not try to expand a cluster unless it is completely healthy!
 .PP
 2, On all nodes, edit /etc/ctdb/nodes and add the new node as the last entry to the file\&. The new node MUST be added to the end of this file!
 .PP
 3, Verify that all the nodes have identical /etc/ctdb/nodes files after you edited them and added the new node!
 .PP
-4, Run \'ctdb reloadnodes\' to force all nodes to reload the nodesfile\&.
+4, Run \*(Aqctdb reloadnodes\*(Aq to force all nodes to reload the nodesfile\&.
 .PP
-5, Use \'ctdb status\' on all nodes and verify that they now show the additional node\&.
+5, Use \*(Aqctdb status\*(Aq on all nodes and verify that they now show the additional node\&.
 .PP
 6, Install and configure the new node and bring it online\&.
 .PP
 Procedure to remove a node:
 .PP
-1, To remove a node from an existing cluster, first ensure with \'ctdb status\' that all nodes, except the node to be deleted, are up and running and that they are all healthy\&. Do not try to remove a node from a cluster unless the cluster is completely healthy!
+1, To remove a node from an existing cluster, first ensure with \*(Aqctdb status\*(Aq that all nodes, except the node to be deleted, are up and running and that they are all healthy\&. Do not try to remove a node from a cluster unless the cluster is completely healthy!
 .PP
 2, Shutdown and poerwoff the node to be removed\&.
 .PP
-3, On all other nodes, edit the /etc/ctdb/nodes file and comment out the node to be removed\&. Do not delete the line for that node, just comment it out by adding a \'#\' at the beginning of the line\&.
+3, On all other nodes, edit the /etc/ctdb/nodes file and comment out the node to be removed\&. Do not delete the line for that node, just comment it out by adding a \*(Aq#\*(Aq at the beginning of the line\&.
 .PP
-4, Run \'ctdb reloadnodes\' to force all nodes to reload the nodesfile\&.
+4, Run \*(Aqctdb reloadnodes\*(Aq to force all nodes to reload the nodesfile\&.
 .PP
-5, Use \'ctdb status\' on all nodes and verify that the deleted node no longer shows up in the list\&.\&.
+5, Use \*(Aqctdb status\*(Aq on all nodes and verify that the deleted node no longer shows up in the list\&.\&.
 .PP
 .SS "tickle <srcip:port> <dstip:port>"
 .PP
@@ -793,7 +802,7 @@ This command checks if a specific process exists on the CTDB host\&. This is mai
 .PP
 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\&.
 .PP
-If a PERSISTENT database is not in a healthy state the database is flagged as UNHEALTHY\&. If there\'s at least one completely healthy node running in the cluster, it\'s possible that the content is restored by a recovery run automaticly\&. Otherwise an administrator needs to analyze the problem\&.
+If a PERSISTENT database is not in a healthy state the database is flagged as UNHEALTHY\&. If there\*(Aqs at least one completely healthy node running in the cluster, it\*(Aqs possible that the content is restored by a recovery run automaticly\&. Otherwise an administrator needs to analyze the problem\&.
 .PP
 See also "ctdb getdbstatus", "ctdb backupdb", "ctdb restoredb", "ctdb dumpbackup", "ctdb wipedb", "ctdb setvar AllowUnhealthyDBRead 1" and (if samba or tdb\-utils are installed) "tdbtool check"\&.
 .PP
@@ -886,7 +895,7 @@ dbid: 0xf2a58948
 name: registry\&.tdb
 path: /var/ctdb/persistent/registry\&.tdb\&.0
 PERSISTENT: yes
-HEALTH: NO\-HEALTHY\-NODES \- ERROR \- Backup of corrupted TDB in \'/var/ctdb/persistent/registry\&.tdb\&.0\&.corrupted\&.20091208091949\&.0Z\'
+HEALTH: NO\-HEALTHY\-NODES \- ERROR \- Backup of corrupted TDB in \*(Aq/var/ctdb/persistent/registry\&.tdb\&.0\&.corrupted\&.20091208091949\&.0Z\*(Aq
       
 .fi
 .if n \{\
diff --git a/doc/ctdbd.1 b/doc/ctdbd.1
index b7e7c04..9242e7b 100644
--- a/doc/ctdbd.1
+++ b/doc/ctdbd.1
@@ -2,12 +2,12 @@
 .\"     Title: ctdbd
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 07/24/2012
+.\"      Date: 01/02/2013
 .\"    Manual: CTDB - clustered TDB database
 .\"    Source: ctdb
 .\"  Language: English
 .\"
-.TH "CTDBD" "1" "07/24/2012" "ctdb" "CTDB \- clustered TDB database"
+.TH "CTDBD" "1" "01/02/2013" "ctdb" "CTDB \- clustered TDB database"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -402,6 +402,15 @@ When set to 1, ctdb will not perform failback of IP addresses when a node become
 Use with caution! Normally when a node becomes available to the cluster ctdb will try to reassign public IP addresses onto the new node as a way to distribute the workload evenly across the clusternode\&. Ctdb tries to make sure that all running nodes have approximately the same number of public addresses it hosts\&.
 .PP
 When you enable this tunable, CTDB will no longer attempt to rebalance the cluster by failing IP addresses back to the new nodes\&. An unbalanced cluster will therefore remain unbalanced until there is manual intervention from the administrator\&. When this parameter is set, you can manually fail public IP addresses over to the new node(s) using the \*(Aqctdb moveip\*(Aq command\&.
+.SS "RecoverPDBBySeqNum"
+.PP
+Default: 1
+.PP
+When set to zero, database recovery for persistent databases is record\-by\-record and recovery process simply collects the most recent version of every individual record\&.
+.PP
+When set to non\-zero, persistent databases will instead be recovered as a whole db and not by individual records\&. The node that contains the highest value stored in the record "__db_sequence_number__" is selected and the copy of that nodes database is used as the recovered database\&.
+.PP
+By default, recovery of persistent databases is done using __db_sequence_number__ record\&.
 .SH "LVS"
 .PP
 LVS is a mode where CTDB presents one single IP address for the entire cluster\&. This is an alternative to using public IP addresses and round\-robin DNS to loadbalance clients across the cluster\&.
diff --git a/doc/ctdbd.1.html b/doc/ctdbd.1.html
index 0bc2d5d..e34afda 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.76.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" title="ctdbd"><a name="ctdbd.1"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>ctdbd — The CTDB cluster daemon</p></div><div class="refsynopsisdiv" title="Synopsis"><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=<INTEGER>] {--dbdir=<directory>} {--dbdir-persistent=<directory>} [--event-script-dir=<directory>] [-i --interactive] [--listen=<address>] [--logfile=<filename>] [--lvs] {--nlist=<filename>} [--no-lmaster] [--no-recmaster] [--nosetsched] {--notification-script=<filename>} [--public-add
 resses=<filename>] [--public-interface=<interface>] {--reclock=<filename>} [--single-public-ip=<address>] [--socket=<filename>] [--start-as-disabled] [--start-as-stopped] [--syslog] [--log-ringbuf-size=<num-entries>] [--torture] [--transport=<STRING>] [--usage]</p></div></div><div class="refsect1" title="DESCRIPTION"><a name="idp209384"></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.76.1"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div class="refentry" title="ctdbd"><a name="ctdbd.1"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p>ctdbd — The CTDB cluster daemon</p></div><div class="refsynopsisdiv" title="Synopsis"><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=<INTEGER>] {--dbdir=<directory>} {--dbdir-persistent=<directory>} [--event-script-dir=<directory>] [-i --interactive] [--listen=<address>] [--logfile=<filename>] [--lvs] {--nlist=<filename>} [--no-lmaster] [--no-recmaster] [--nosetsched] {--notification-script=<filename>} [--public-add
 resses=<filename>] [--public-interface=<interface>] {--reclock=<filename>} [--single-public-ip=<address>] [--socket=<filename>] [--start-as-disabled] [--start-as-stopped] [--syslog] [--log-ringbuf-size=<num-entries>] [--torture] [--transport=<STRING>] [--usage]</p></div></div><div class="refsect1" title="DESCRIPTION"><a name="idp93712"></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" title="OPTIONS"><a name="idp211392"></a><h2>OPTIONS</h2><div class="variablelist"><dl><dt><span class="term">-? --help</span></dt><dd><p>
+    </p></div><div class="refsect1" title="OPTIONS"><a name="idp97024"></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=<DEBUGLEVEL></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.
@@ -154,10 +154,10 @@
 	    implemented in the future.
           </p></dd><dt><span class="term">--usage</span></dt><dd><p>
             Print useage information to the screen.
-          </p></dd></dl></div></div><div class="refsect1" title="Private vs Public addresses"><a name="idp100752"></a><h2>Private vs Public addresses</h2><p>
+          </p></dd></dl></div></div><div class="refsect1" title="Private vs Public addresses"><a name="idp5192560"></a><h2>Private vs Public addresses</h2><p>
       When used for ip takeover in a HA environment, each node in a ctdb 
       cluster has multiple ip addresses assigned to it. One private and one or more public.
-    </p><div class="refsect2" title="Private address"><a name="idp101376"></a><h3>Private address</h3><p>
+    </p><div class="refsect2" title="Private address"><a name="idp5193648"></a><h3>Private address</h3><p>
         This is the physical ip address of the node which is configured in 
         linux and attached to a physical interface. This address uniquely
         identifies a physical node in the cluster and is the ip addresses
@@ -187,7 +187,7 @@
         10.1.1.2
         10.1.1.3
         10.1.1.4
-      </pre></div><div class="refsect2" title="Public address"><a name="idp104280"></a><h3>Public address</h3><p>
+      </pre></div><div class="refsect2" title="Public address"><a name="idp5197952"></a><h3>Public address</h3><p>
         A public address on the other hand is not attached to an interface.
         This address is managed by ctdbd itself and is attached/detached to
         a physical node at runtime.
@@ -248,7 +248,7 @@
 	unavailable. 10.1.1.1 can not be failed over to node 2 or node 3 since
 	these nodes do not have this ip address listed in their public
 	addresses file.
-	</p></div></div><div class="refsect1" title="Node status"><a name="idp109200"></a><h2>Node status</h2><p>
+	</p></div></div><div class="refsect1" title="Node status"><a name="idp5205152"></a><h2>Node status</h2><p>
       The current status of each node in the cluster can be viewed by the 
       'ctdb status' command.
     </p><p>
@@ -285,50 +285,62 @@
       RECMASTER or NATGW.
       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="refsect1" title="PUBLIC TUNABLES"><a name="idp113224"></a><h2>PUBLIC TUNABLES</h2><p>
+    </p></div><div class="refsect1" title="PUBLIC TUNABLES"><a name="idp5210864"></a><h2>PUBLIC TUNABLES</h2><p>
     These are the public tuneables that can be used to control how ctdb behaves.
-    </p><div class="refsect2" title="KeepaliveInterval"><a name="idp113856"></a><h3>KeepaliveInterval</h3><p>Default: 1</p><p>
+    </p><div class="refsect2" title="KeepaliveInterval"><a name="idp5211984"></a><h3>KeepaliveInterval</h3><p>Default: 1</p><p>
     How often should the nodes send keepalives to eachother.
-    </p></div><div class="refsect2" title="KeepaliveLimit"><a name="idp114672"></a><h3>KeepaliveLimit</h3><p>Default: 5</p><p>
+    </p></div><div class="refsect2" title="KeepaliveLimit"><a name="idp5213472"></a><h3>KeepaliveLimit</h3><p>Default: 5</p><p>
     After how many keepalive intervals without any traffic should a node
     wait until marking the peer as DISCONNECTED.
-    </p></div><div class="refsect2" title="MonitorInterval"><a name="idp115552"></a><h3>MonitorInterval</h3><p>Default: 15</p><p>
+    </p></div><div class="refsect2" title="MonitorInterval"><a name="idp5215024"></a><h3>MonitorInterval</h3><p>Default: 15</p><p>
     How often should ctdb run the event scripts to check for a nodes health.
-    </p></div><div class="refsect2" title="TickleUpdateInterval"><a name="idp116384"></a><h3>TickleUpdateInterval</h3><p>Default: 20</p><p>
+    </p></div><div class="refsect2" title="TickleUpdateInterval"><a name="idp5216528"></a><h3>TickleUpdateInterval</h3><p>Default: 20</p><p>
     How often will ctdb record and store the "tickle" information used to
     kickstart stalled tcp connections after a recovery.
-    </p></div><div class="refsect2" title="EventScriptTimeout"><a name="idp117248"></a><h3>EventScriptTimeout</h3><p>Default: 20</p><p>
+    </p></div><div class="refsect2" title="EventScriptTimeout"><a name="idp5218080"></a><h3>EventScriptTimeout</h3><p>Default: 20</p><p>
     How long should ctdb let an event script run before aborting it and
     marking the node unhealthy.
-    </p></div><div class="refsect2" title="RecoveryBanPeriod"><a name="idp118112"></a><h3>RecoveryBanPeriod</h3><p>Default: 300</p><p>
+    </p></div><div class="refsect2" title="RecoveryBanPeriod"><a name="idp5219616"></a><h3>RecoveryBanPeriod</h3><p>Default: 300</p><p>
     If a node becomes banned causing repetitive recovery failures. The node will
     eventually become banned from the cluster.
     This controls how long the culprit node will be banned from the cluster
     before it is allowed to try to join the cluster again.
     Don't set to small. A node gets banned for a reason and it is usually due
     to real problems with the node.
-    </p></div><div class="refsect2" title="DatabaseHashSize"><a name="idp119256"></a><h3>DatabaseHashSize</h3><p>Default: 100000</p><p>
+    </p></div><div class="refsect2" title="DatabaseHashSize"><a name="idp5221424"></a><h3>DatabaseHashSize</h3><p>Default: 100000</p><p>
     Size of the hash chains for the local store of the tdbs that ctdb manages.
-    </p></div><div class="refsect2" title="RerecoveryTimeout"><a name="idp120104"></a><h3>RerecoveryTimeout</h3><p>Default: 10</p><p>
+    </p></div><div class="refsect2" title="RerecoveryTimeout"><a name="idp5222928"></a><h3>RerecoveryTimeout</h3><p>Default: 10</p><p>
     Once a recovery has completed, no additional recoveries are permitted until this timeout has expired.
-    </p></div><div class="refsect2" title="EnableBans"><a name="idp120968"></a><h3>EnableBans</h3><p>Default: 1</p><p>
+    </p></div><div class="refsect2" title="EnableBans"><a name="idp5224464"></a><h3>EnableBans</h3><p>Default: 1</p><p>
     When set to 0, this disables BANNING completely in the cluster and thus nodes can not get banned, even it they break. Don't set to 0.
-    </p></div><div class="refsect2" title="DeterministicIPs"><a name="idp121856"></a><h3>DeterministicIPs</h3><p>Default: 1</p><p>
+    </p></div><div class="refsect2" title="DeterministicIPs"><a name="idp5226032"></a><h3>DeterministicIPs</h3><p>Default: 1</p><p>
     When enabled, this tunable makes ctdb try to keep public IP addresses locked to specific nodes as far as possible. This makes it easier for debugging since you can know that as long as all nodes are healthy public IP X will always be hosted by node Y. 
     </p><p>
     The cost of using deterministic IP address assignment is that it disables part of the logic where ctdb tries to reduce the number of public IP assignment changes in the cluster. This tunable may increase the number of IP failover/failbacks that are performed on the cluster by a small margin.
-    </p></div><div class="refsect2" title="DisableWhenUnhealthy"><a name="idp123376"></a><h3>DisableWhenUnhealthy</h3><p>Default: 0</p><p>
+    </p></div><div class="refsect2" title="DisableWhenUnhealthy"><a name="idp5228416"></a><h3>DisableWhenUnhealthy</h3><p>Default: 0</p><p>
     When set, As soon as a node becomes unhealthy, that node will also automatically become permanently DISABLED. Once a node is DISABLED, the only way to make it participate in the cluster again and host services is by manually enabling the node again using 'ctdb enable'. 
     </p><p>
     This disables parts of the resilience and robustness of the cluster and should ONLY be used when the system administrator is actively monitoring the cluster, so that nodes can be enabled again.
-    </p></div><div class="refsect2" title="NoIPFailback"><a name="idp124784"></a><h3>NoIPFailback</h3><p>Default: 0</p><p>
+    </p></div><div class="refsect2" title="NoIPFailback"><a name="idp5230736"></a><h3>NoIPFailback</h3><p>Default: 0</p><p>
     When set to 1, ctdb will not perform failback of IP addresses when a node becomes healthy. Ctdb WILL perform failover of public IP addresses when a node becomes UNHEALTHY, but when the node becomes HEALTHY again, ctdb will not fail the addresses back.
     </p><p>
     Use with caution! Normally when a node becomes available to the cluster
 ctdb will try to reassign public IP addresses onto the new node as a way to distribute the workload evenly across the clusternode. Ctdb tries to make sure that all running nodes have approximately the same number of public addresses it hosts.
     </p><p>
     When you enable this tunable, CTDB will no longer attempt to rebalance the cluster by failing IP addresses back to the new nodes. An unbalanced cluster will therefore remain unbalanced until there is manual intervention from the administrator. When this parameter is set, you can manually fail public IP addresses over to the new node(s) using the 'ctdb moveip' command.
-    </p></div></div><div class="refsect1" title="LVS"><a name="idp126976"></a><h2>LVS</h2><p>
+    </p></div><div class="refsect2" title="RecoverPDBBySeqNum"><a name="idp5233920"></a><h3>RecoverPDBBySeqNum</h3><p>Default: 1</p><p>
+	When set to zero, database recovery for persistent
+	databases is record-by-record and recovery process simply collects
+	the most recent version of every individual record.
+    </p><p>
+	When set to non-zero, persistent databases will instead be recovered
+	as a whole db and not by individual records. The node that contains the highest
+	value stored in the record "__db_sequence_number__" is selected and the copy of
+	that nodes database is used as the recovered database.
+    </p><p>
+        By default, recovery of persistent databases is done using __db_sequence_number__
+	record.
+    </p></div></div><div class="refsect1" title="LVS"><a name="idp5236848"></a><h2>LVS</h2><p>
     LVS is a mode where CTDB presents one single IP address for the entire
     cluster. This is an alternative to using public IP addresses and round-robin
     DNS to loadbalance clients across the cluster.
@@ -369,7 +381,7 @@ ctdb will try to reassign public IP addresses onto the new node as a way to dist
     the processing node back to the clients. For read-intensive i/o patterns you can acheive very high throughput rates in this mode.
     </p><p>
     Note: you can use LVS and public addresses at the same time.
-    </p><div class="refsect2" title="Configuration"><a name="idp131752"></a><h3>Configuration</h3><p>
+    </p><div class="refsect2" title="Configuration"><a name="idp5243072"></a><h3>Configuration</h3><p>
     To activate LVS on a CTDB node you must specify CTDB_PUBLIC_INTERFACE and 
     CTDB_LVS_PUBLIC_ADDRESS in /etc/sysconfig/ctdb.
 	</p><p>
@@ -392,7 +404,7 @@ You must also specify the "--lvs" command line argument to ctdbd to activete LVS
     all of the clients from the node BEFORE you enable LVS. Also make sure
     that when you ping these hosts that the traffic is routed out through the
     eth0 interface.
-    </p></div><div class="refsect1" title="REMOTE CLUSTER NODES"><a name="idp134640"></a><h2>REMOTE CLUSTER NODES</h2><p>
+    </p></div><div class="refsect1" title="REMOTE CLUSTER NODES"><a name="idp5247552"></a><h2>REMOTE CLUSTER NODES</h2><p>
 It is possible to have a CTDB cluster that spans across a WAN link. 
 For example where you have a CTDB cluster in your datacentre but you also
 want to have one additional CTDB node located at a remote branch site.
@@ -421,7 +433,7 @@ CTDB_CAPABILITY_RECMASTER=no
     </p><p>
 	Verify with the command "ctdb getcapabilities" that that node no longer
 	has the recmaster or the lmaster capabilities.
-    </p></div><div class="refsect1" title="NAT-GW"><a name="idp137680"></a><h2>NAT-GW</h2><p>
+    </p></div><div class="refsect1" title="NAT-GW"><a name="idp5252208"></a><h2>NAT-GW</h2><p>
       Sometimes it is desireable to run services on the CTDB node which will
       need to originate outgoing traffic to external servers. This might
       be contacting NIS servers, LDAP servers etc. etc.
@@ -444,7 +456,7 @@ CTDB_CAPABILITY_RECMASTER=no
       if there are no public addresses assigned to the node.
       This is the simplest way but it uses up a lot of ip addresses since you
       have to assign both static and also public addresses to each node.
-    </p><div class="refsect2" title="NAT-GW"><a name="idp140096"></a><h3>NAT-GW</h3><p>
+    </p><div class="refsect2" title="NAT-GW"><a name="idp5255664"></a><h3>NAT-GW</h3><p>
       A second way is to use the built in NAT-GW feature in CTDB.
       With NAT-GW you assign one public NATGW address for each natgw group.
       Each NATGW group is a set of nodes in the cluster that shares the same
@@ -459,7 +471,7 @@ CTDB_CAPABILITY_RECMASTER=no
       In each NATGW group, one of the nodes is designated the NAT Gateway
       through which all traffic that is originated by nodes in this group
       will be routed through if a public addresses are not available. 
-    </p></div><div class="refsect2" title="Configuration"><a name="idp141880"></a><h3>Configuration</h3><p>
+    </p></div><div class="refsect2" title="Configuration"><a name="idp5258352"></a><h3>Configuration</h3><p>
       NAT-GW is configured in /etc/sysconfigctdb by setting the following
       variables:
     </p><pre class="screen">
@@ -507,31 +519,31 @@ CTDB_CAPABILITY_RECMASTER=no
 # become natgw master.
 #
 # CTDB_NATGW_SLAVE_ONLY=yes
-    </pre></div><div class="refsect2" title="CTDB_NATGW_PUBLIC_IP"><a name="idp142856"></a><h3>CTDB_NATGW_PUBLIC_IP</h3><p>
+    </pre></div><div class="refsect2" title="CTDB_NATGW_PUBLIC_IP"><a name="idp5264224"></a><h3>CTDB_NATGW_PUBLIC_IP</h3><p>
       This is an ip address in the public network that is used for all outgoing
       traffic when the public addresses are not assigned.
       This address will be assigned to one of the nodes in the cluster which
       will masquerade all traffic for the other nodes.
     </p><p>
       Format of this parameter is IPADDRESS/NETMASK
-    </p></div><div class="refsect2" title="CTDB_NATGW_PUBLIC_IFACE"><a name="idp143904"></a><h3>CTDB_NATGW_PUBLIC_IFACE</h3><p>
+    </p></div><div class="refsect2" title="CTDB_NATGW_PUBLIC_IFACE"><a name="idp5266000"></a><h3>CTDB_NATGW_PUBLIC_IFACE</h3><p>
       This is the physical interface where the CTDB_NATGW_PUBLIC_IP will be
       assigned to. This should be an interface connected to the public network.
     </p><p>
       Format of this parameter is INTERFACE
-    </p></div><div class="refsect2" title="CTDB_NATGW_DEFAULT_GATEWAY"><a name="idp144832"></a><h3>CTDB_NATGW_DEFAULT_GATEWAY</h3><p>
+    </p></div><div class="refsect2" title="CTDB_NATGW_DEFAULT_GATEWAY"><a name="idp5267584"></a><h3>CTDB_NATGW_DEFAULT_GATEWAY</h3><p>
       This is the default gateway to use on the node that is elected to host
       the CTDB_NATGW_PUBLIC_IP. This is the default gateway on the public network.
     </p><p>
       Format of this parameter is IPADDRESS
-    </p></div><div class="refsect2" title="CTDB_NATGW_PRIVATE_NETWORK"><a name="idp145768"></a><h3>CTDB_NATGW_PRIVATE_NETWORK</h3><p>
+    </p></div><div class="refsect2" title="CTDB_NATGW_PRIVATE_NETWORK"><a name="idp5269168"></a><h3>CTDB_NATGW_PRIVATE_NETWORK</h3><p>
       This is the network/netmask used for the interal private network.
     </p><p>
       Format of this parameter is IPADDRESS/NETMASK
-    </p></div><div class="refsect2" title="CTDB_NATGW_NODES"><a name="idp3303088"></a><h3>CTDB_NATGW_NODES</h3><p>
+    </p></div><div class="refsect2" title="CTDB_NATGW_NODES"><a name="idp5270752"></a><h3>CTDB_NATGW_NODES</h3><p>
       This is the list of all nodes that belong to the same NATGW group
       as this node. The default is /etc/ctdb/natgw_nodes.
-    </p></div><div class="refsect2" title="Operation"><a name="idp3303744"></a><h3>Operation</h3><p>
+    </p></div><div class="refsect2" title="Operation"><a name="idp5271920"></a><h3>Operation</h3><p>
       When the NAT-GW functionality is used, one of the nodes is elected
       to act as a NAT router for all the other nodes in the group when
       they need to originate traffic to the external public network.
@@ -550,7 +562,7 @@ CTDB_CAPABILITY_RECMASTER=no
     </p><p>
       This is implemented in the 11.natgw eventscript. Please see the
       eventscript for further information.
-    </p></div><div class="refsect2" title="Removing/Changing NATGW at runtime"><a name="idp3305832"></a><h3>Removing/Changing NATGW at runtime</h3><p>
+    </p></div><div class="refsect2" title="Removing/Changing NATGW at runtime"><a name="idp5275120"></a><h3>Removing/Changing NATGW at runtime</h3><p>
       The following are the procedures to change/remove a NATGW configuration 
       at runtime, without having to restart ctdbd.
     </p><p>
@@ -564,7 +576,7 @@ CTDB_CAPABILITY_RECMASTER=no
 1, Run 'CTDB_BASE=/etc/ctdb /etc/ctdb/events.d/11.natgw removenatgw'
 2, Then change the configuration in /etc/sysconfig/ctdb
 3, Run 'CTDB_BASE=/etc/ctdb /etc/ctdb/events.d/11.natgw updatenatgw'
-    </pre></div></div><div class="refsect1" title="NOTIFICATION SCRIPT"><a name="idp3308080"></a><h2>NOTIFICATION SCRIPT</h2><p>
+    </pre></div></div><div class="refsect1" title="NOTIFICATION SCRIPT"><a name="idp5278960"></a><h2>NOTIFICATION SCRIPT</h2><p>
       Notification scripts are used with ctdb to have a call-out from ctdb
       to a user-specified script when certain state changes occur in ctdb.
       This is commonly to set up either sending SNMP traps or emails
@@ -576,17 +588,17 @@ CTDB_CAPABILITY_RECMASTER=no
       See /etc/ctdb/notify.sh for an example script.
     </p><p>
       CTDB currently generates notifications on these state changes:
-    </p><div class="refsect2" title="unhealthy"><a name="idp3309880"></a><h3>unhealthy</h3><p>
+    </p><div class="refsect2" title="unhealthy"><a name="idp5281840"></a><h3>unhealthy</h3><p>
       This call-out is triggered when the node changes to UNHEALTHY state.
-    </p></div><div class="refsect2" title="healthy"><a name="idp3310480"></a><h3>healthy</h3><p>
+    </p></div><div class="refsect2" title="healthy"><a name="idp5282960"></a><h3>healthy</h3><p>
       This call-out is triggered when the node changes to HEALTHY state.
-    </p></div><div class="refsect2" title="startup"><a name="idp3311080"></a><h3>startup</h3><p>
+    </p></div><div class="refsect2" title="startup"><a name="idp5284080"></a><h3>startup</h3><p>
       This call-out is triggered when ctdb has started up and all managed services are up and running.
-    </p></div></div><div class="refsect1" title="ClamAV Daemon"><a name="idp3311776"></a><h2>ClamAV Daemon</h2><p>
+    </p></div></div><div class="refsect1" title="ClamAV Daemon"><a name="idp5285360"></a><h2>ClamAV Daemon</h2><p>
 CTDB has support to manage the popular anti-virus daemon ClamAV.
 This support is implemented through the
 eventscript : /etc/ctdb/events.d/31.clamd.
-</p><div class="refsect2" title="Configuration"><a name="idp3312384"></a><h3>Configuration</h3><p>
+</p><div class="refsect2" title="Configuration"><a name="idp5286416"></a><h3>Configuration</h3><p>
 Start by configuring CLAMAV normally and test that it works. Once this is
 done, copy the configuration files over to all the nodes so that all nodes
 share identical CLAMAV configurations.
@@ -615,10 +627,10 @@ Once you have restarted CTDBD, use
 ctdb scriptstatus
 </pre><p>
 and verify that the 31.clamd eventscript is listed and that it was executed successfully.
-</p></div></div><div class="refsect1" title="SEE ALSO"><a name="idp3315856"></a><h2>SEE ALSO</h2><p>
+</p></div></div><div class="refsect1" title="SEE ALSO"><a name="idp5292480"></a><h2>SEE ALSO</h2><p>
       ctdb(1), onnode(1)
       <a class="ulink" href="http://ctdb.samba.org/" target="_top">http://ctdb.samba.org/</a>
-    </p></div><div class="refsect1" title="COPYRIGHT/LICENSE"><a name="idp3316616"></a><h2>COPYRIGHT/LICENSE</h2><div class="literallayout"><p><br>
+    </p></div><div class="refsect1" title="COPYRIGHT/LICENSE"><a name="idp5294000"></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/ctdbd.1.xml b/doc/ctdbd.1.xml
index ac5cf47..e4ecbfe 100644
--- a/doc/ctdbd.1.xml
+++ b/doc/ctdbd.1.xml
@@ -659,6 +659,7 @@
     This disables parts of the resilience and robustness of the cluster and should ONLY be used when the system administrator is actively monitoring the cluster, so that nodes can be enabled again.
     </para>
     </refsect2>
+
     <refsect2><title>NoIPFailback</title>
     <para>Default: 0</para>
     <para>
@@ -672,6 +673,26 @@ ctdb will try to reassign public IP addresses onto the new node as a way to dist
     When you enable this tunable, CTDB will no longer attempt to rebalance the cluster by failing IP addresses back to the new nodes. An unbalanced cluster will therefore remain unbalanced until there is manual intervention from the administrator. When this parameter is set, you can manually fail public IP addresses over to the new node(s) using the 'ctdb moveip' command.
     </para>
     </refsect2>
+
+    <refsect2><title>RecoverPDBBySeqNum</title>
+    <para>Default: 1</para>
+    <para>
+	When set to zero, database recovery for persistent
+	databases is record-by-record and recovery process simply collects
+	the most recent version of every individual record.
+    </para>
+    <para>
+	When set to non-zero, persistent databases will instead be recovered
+	as a whole db and not by individual records. The node that contains the highest
+	value stored in the record "__db_sequence_number__" is selected and the copy of
+	that nodes database is used as the recovered database.
+    </para>
+    <para>
+        By default, recovery of persistent databases is done using __db_sequence_number__
+	record.
+    </para>
+    </refsect2>
+
   </refsect1>
 
   <refsect1><title>LVS</title>
diff --git a/include/ctdb.h b/include/ctdb.h
index 289381f..3e5afff 100644
--- a/include/ctdb.h
+++ b/include/ctdb.h
@@ -471,6 +471,35 @@ bool ctdb_getpnn_recv(struct ctdb_connection *ctdb,
 
 
 /**
+ * ctdb_getdbseqnum_send - read the sequence number off a db
+ * @ctdb: the ctdb_connection from ctdb_connect.
+ * @destnode: the destination node (see below)
+ * @dbid: database id
+ * @callback: the callback when ctdb replies to our message (typesafe)
+ * @cbdata: the argument to callback()
+ *
+ * There are several special values for destnode, detailed in
+ * ctdb_protocol.h, particularly CTDB_CURRENT_NODE which means the
+ * local ctdbd.
+ */
+struct ctdb_request *
+ctdb_getdbseqnum_send(struct ctdb_connection *ctdb,
+		 uint32_t destnode,
+		 uint32_t dbid,
+		 ctdb_callback_t callback,
+		 void *cbdata);
+/**
+ * ctdb_getdbseqnum_recv - read the sequence number off a database
+ * @ctdb: the ctdb_connection from ctdb_connect.
+ * @req: the completed request.
+ * @seqnum: a pointer to the seqnum to fill in
+ *
+ * This returns false if something went wrong, or otherwise fills in pnn.
+ */
+bool ctdb_getdbseqnum_recv(struct ctdb_connection *ctdb,
+		      struct ctdb_request *req, uint64_t *seqnum);
+
+/**
  * ctdb_getnodemap_send - read the nodemap number from a node.
  * @ctdb: the ctdb_connection from ctdb_connect.
  * @destnode: the destination node (see below)
@@ -670,6 +699,25 @@ bool ctdb_getpnn(struct ctdb_connection *ctdb,
 		 uint32_t *pnn);
 
 /**
+ * ctdb_getdbseqnum - read the seqnum of a database
+ * @ctdb: the ctdb_connection from ctdb_connect.
+ * @destnode: the destination node (see below)
+ * @dbid: database id
+ * @seqnum: sequence number for the database
+ *
+ * There are several special values for destnode, detailed in
+ * ctdb_protocol.h, particularly CTDB_CURRENT_NODE which means the
+ * local ctdbd.
+ *
+ * Returns true and fills in *pnn on success.
+ */
+bool
+ctdb_getdbseqnum(struct ctdb_connection *ctdb,
+		 uint32_t destnode,
+		 uint32_t dbid,
+		 uint64_t *seqnum);
+


-- 
CTDB repository


More information about the samba-cvs mailing list