[SCM] CTDB repository - branch master updated -
ctdb-1.0.82-34-gf236fa2
Ronnie Sahlberg
sahlberg at samba.org
Tue Jun 2 03:03:30 GMT 2009
The branch, master has been updated
via f236fa289f3115b1f4eb108eb668392dc520f61a (commit)
via e3d9722e332f132bd47dc41621d4e1d2b5c9c62a (commit)
via 91fdfee371d6be83af60cd38ac34afb295b9987a (commit)
via c265df3c7950aab51b8b6ef17040229b97345c35 (commit)
via 1b7c88ae7643f9bcc52b1d33095f97de88fc2316 (commit)
via 0cd66c744cd9533ce8d4c4374bcee3bf49b66dae (commit)
via df20cd9b05ad9ca72e32ccc42354eafc12b68c04 (commit)
via 6a5e4fd7fa391206b463bb4e976502f3ac5bd343 (commit)
from b18356764cd49d934eab901e596bb75c6e3ecdf8 (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f236fa289f3115b1f4eb108eb668392dc520f61a
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Tue Jun 2 13:13:03 2009 +1000
new version 1.0.83
commit e3d9722e332f132bd47dc41621d4e1d2b5c9c62a
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Tue Jun 2 12:43:11 2009 +1000
idocument how to remove a node from an existing cluster using 'ctdb
reloadnodes'
commit 91fdfee371d6be83af60cd38ac34afb295b9987a
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Mon Jun 1 15:43:30 2009 +1000
hide all DELETED nodes from the ctdb command output
commit c265df3c7950aab51b8b6ef17040229b97345c35
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Mon Jun 1 15:29:36 2009 +1000
lower the loglevel when we long that we skip an evenscript because it is not executable
commit 1b7c88ae7643f9bcc52b1d33095f97de88fc2316
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Mon Jun 1 14:56:19 2009 +1000
dont try to queue packets for sending to (recently) deleted nodes since these nodes do not have a queue.
commit 0cd66c744cd9533ce8d4c4374bcee3bf49b66dae
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Mon Jun 1 14:44:15 2009 +1000
when building the initial vnnmap, make sure to skip any deleted nodes
commit df20cd9b05ad9ca72e32ccc42354eafc12b68c04
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Mon Jun 1 14:39:34 2009 +1000
use num_nodes and the nodes array instead of walking the vnnmap
when counting the number of active nodes
commit 6a5e4fd7fa391206b463bb4e976502f3ac5bd343
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date: Mon Jun 1 14:18:34 2009 +1000
add a new node state : DELETED.
This is used to mark nodes as being DELETED internally in ctdb
so that nodes are not renumbered if / when they are removed from the nodes file.
This is used to be able to do "ctdb reloadnodes" at runtime without
causing nodes to be renumbered.
To do this, instead of deleting a node from the nodes file, just comment it out like
1.0.0.1
#1.0.0.2
1.0.0.3
After removing 1.0.0.2 from the cluster, the remaining nodes retain their
pnn's from prior to the deletion, namely 0 and 2
Any line in the nodes file that is commented out represents a DELETED pnn
-----------------------------------------------------------------------
Summary of changes:
doc/ctdb.1 | 23 +++++++++---
doc/ctdb.1.html | 66 +++++++++++++++++++--------------
doc/ctdb.1.xml | 34 +++++++++++++----
include/ctdb.h | 5 +++
include/ctdb_private.h | 3 +-
packaging/RPM/ctdb.spec | 26 +++++++++++++-
server/ctdb_keepalive.c | 5 +++
server/ctdb_recover.c | 7 ++++
server/ctdb_recoverd.c | 32 ++++++++++++-----
server/ctdb_server.c | 91 ++++++++++++++++++++++++++++++++++++++++-------
server/ctdb_takeover.c | 4 ++
server/eventscript.c | 2 +-
tcp/tcp_connect.c | 6 +++-
tcp/tcp_init.c | 10 ++++-
tools/ctdb.c | 27 ++++++++++++--
15 files changed, 269 insertions(+), 72 deletions(-)
Changeset truncated at 500 lines:
diff --git a/doc/ctdb.1 b/doc/ctdb.1
index 91c1b64..56b2353 100644
--- a/doc/ctdb.1
+++ b/doc/ctdb.1
@@ -1,11 +1,11 @@
.\" Title: ctdb
.\" Author:
.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\" Date: 03/24/2009
+.\" Date: 06/02/2009
.\" Manual:
.\" Source:
.\"
-.TH "CTDB" "1" "03/24/2009" "" ""
+.TH "CTDB" "1" "06/02/2009" "" ""
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
@@ -469,9 +469,9 @@ This command will kill the specified TCP connection by issuing a TCP RST to the
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\.
.SS "reloadnodes"
.PP
-This command is used when adding new nodes to an existing cluster and to reduce the disruption of this operation\. This command should never be used except when expanding an existing cluster\. This can only be used to expand a cluster\. To remove a node from the cluster you still need to shut down ctdb on all nodes, edit the nodes file and restart ctdb\.
+This command is used when adding new nodes, or removing existing nodes from an existing cluster\.
.PP
-Procedure:
+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!
.PP
@@ -479,11 +479,24 @@ Procedure:
.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 reaload the nodesfile\.
+4, Run \'ctdb reloadnodes\' 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\.
.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!
+.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\.
+.PP
+4, Run \'ctdb reloadnodes\' 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\.\.
+.PP
.SS "tickle <srcip:port> <dstip:port>"
.PP
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 acknowledge number and will when received by the source host result in it sending an immediate correct ACK back to the other end\.
diff --git a/doc/ctdb.1.html b/doc/ctdb.1.html
index f75d28c..7b20c87 100644
--- a/doc/ctdb.1.html
+++ b/doc/ctdb.1.html
@@ -367,14 +367,9 @@ CTDB version 1
through the specified interface. This command is mainly used by the
ctdb eventscripts.
</p></div><div class="refsect2" lang="en"><a name="id2529124"></a><h3>reloadnodes</h3><p>
- This command is used when adding new nodes to an existing cluster and
- to reduce the disruption of this operation. This command should never
- be used except when expanding an existing cluster.
- This can only be used to expand a cluster. To remove a node from the
- cluster you still need to shut down ctdb on all nodes, edit the nodes file
- and restart ctdb.
+ This command is used when adding new nodes, or removing existing nodes from an existing cluster.
</p><p>
- Procedure:
+ Procedure to add a node:
</p><p>
1, To expand an existing cluster, first ensure with 'ctdb status' that
all nodes are up and running and that they are all healthy.
@@ -385,12 +380,27 @@ CTDB version 1
</p><p>
3, Verify that all the nodes have identical /etc/ctdb/nodes files after you edited them and added the new node!
</p><p>
- 4, Run 'ctdb reloadnodes' to force all nodes to reaload the nodesfile.
+ 4, Run 'ctdb reloadnodes' to force all nodes to reload the nodesfile.
</p><p>
5, Use 'ctdb status' on all nodes and verify that they now show the additional node.
</p><p>
6, Install and configure the new node and bring it online.
- </p></div><div class="refsect2" lang="en"><a name="id2529176"></a><h3>tickle <srcip:port> <dstip:port></h3><p>
+ </p><p>
+ Procedure to remove a node:
+ </p><p>
+ 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!
+ </p><p>
+ 2, Shutdown and poerwoff the node to be removed.
+ </p><p>
+ 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.
+ </p><p>
+ 4, Run 'ctdb reloadnodes' to force all nodes to reload the nodesfile.
+ </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="id2529208"></a><h3>tickle <srcip:port> <dstip:port></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
@@ -402,10 +412,10 @@ 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 class="refsect2" lang="en"><a name="id2529200"></a><h3>gettickles <ip></h3><p>
+ </p></div><div class="refsect2" lang="en"><a name="id2529233"></a><h3>gettickles <ip></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="id2529212"></a><h3>repack [max_freelist]</h3><p>
+ </p></div><div class="refsect2" lang="en"><a name="id2529244"></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>
@@ -420,7 +430,7 @@ CTDB version 1
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="id2529258"></a><h3>vacuum [max_records]</h3><p>
+ </p></div><div class="refsect2" lang="en"><a name="id2529290"></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>
@@ -436,12 +446,12 @@ CTDB version 1
Example: ctdb vacuum
</p><p>
By default, this operation is issued from the 00.ctdb event script every 5 minutes.
- </p></div></div><div class="refsect1" lang="en"><a name="id2529295"></a><h2>Debugging Commands</h2><p>
+ </p></div></div><div class="refsect1" lang="en"><a name="id2529327"></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="id2529305"></a><h3>process-exists <pid></h3><p>
+ </p><div class="refsect2" lang="en"><a name="id2529337"></a><h3>process-exists <pid></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="id2529317"></a><h3>getdbmap</h3><p>
+ </p></div><div class="refsect2" lang="en"><a name="id2529350"></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.
@@ -460,25 +470,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="id2529364"></a><h3>catdb <dbname></h3><p>
+ </pre></div><div class="refsect2" lang="en"><a name="id2529396"></a><h3>catdb <dbname></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="id2529374"></a><h3>getmonmode</h3><p>
+ </p></div><div class="refsect2" lang="en"><a name="id2529407"></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="id2529405"></a><h3>setmonmode <0|1></h3><p>
+ </p></div><div class="refsect2" lang="en"><a name="id2529438"></a><h3>setmonmode <0|1></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="id2529421"></a><h3>attach <dbname></h3><p>
+ </p></div><div class="refsect2" lang="en"><a name="id2529453"></a><h3>attach <dbname></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="id2529432"></a><h3>dumpmemory</h3><p>
+ </p></div><div class="refsect2" lang="en"><a name="id2529464"></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="id2529444"></a><h3>rddumpmemory</h3><p>
+ </p></div><div class="refsect2" lang="en"><a name="id2529476"></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="id2529455"></a><h3>freeze</h3><p>
+ </p></div><div class="refsect2" lang="en"><a name="id2529487"></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.
@@ -486,20 +496,20 @@ 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="id2529473"></a><h3>thaw</h3><p>
+ </p></div><div class="refsect2" lang="en"><a name="id2529506"></a><h3>thaw</h3><p>
Thaw a previously frozen node.
- </p></div><div class="refsect2" lang="en"><a name="id2529483"></a><h3>eventscript <arguments></h3><p>
+ </p></div><div class="refsect2" lang="en"><a name="id2529515"></a><h3>eventscript <arguments></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="id2529495"></a><h3>backupdb <database> <file></h3><p>
+ </p></div><div class="refsect2" lang="en"><a name="id2529527"></a><h3>backupdb <database> <file></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="id2529509"></a><h3>restoredb <file></h3><p>
+ </p></div><div class="refsect2" lang="en"><a name="id2529541"></a><h3>restoredb <file></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="id2529521"></a><h2>SEE ALSO</h2><p>
+ </p></div></div><div class="refsect1" lang="en"><a name="id2529553"></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="id2529534"></a><h2>COPYRIGHT/LICENSE</h2><div class="literallayout"><p><br>
+ </p></div><div class="refsect1" lang="en"><a name="id2529566"></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 a88e8ad..7b327fb 100644
--- a/doc/ctdb.1.xml
+++ b/doc/ctdb.1.xml
@@ -679,15 +679,10 @@ CTDB version 1
<refsect2><title>reloadnodes</title>
<para>
- This command is used when adding new nodes to an existing cluster and
- to reduce the disruption of this operation. This command should never
- be used except when expanding an existing cluster.
- This can only be used to expand a cluster. To remove a node from the
- cluster you still need to shut down ctdb on all nodes, edit the nodes file
- and restart ctdb.
+ This command is used when adding new nodes, or removing existing nodes from an existing cluster.
</para>
<para>
- Procedure:
+ Procedure to add a node:
</para>
<para>
1, To expand an existing cluster, first ensure with 'ctdb status' that
@@ -702,7 +697,7 @@ CTDB version 1
3, Verify that all the nodes have identical /etc/ctdb/nodes files after you edited them and added the new node!
</para>
<para>
- 4, Run 'ctdb reloadnodes' to force all nodes to reaload the nodesfile.
+ 4, Run 'ctdb reloadnodes' to force all nodes to reload the nodesfile.
</para>
<para>
5, Use 'ctdb status' on all nodes and verify that they now show the additional node.
@@ -710,6 +705,29 @@ CTDB version 1
<para>
6, Install and configure the new node and bring it online.
</para>
+ <para>
+ Procedure to remove a node:
+ </para>
+ <para>
+ 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!
+ </para>
+ <para>
+ 2, Shutdown and poerwoff the node to be removed.
+ </para>
+ <para>
+ 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.
+ </para>
+ <para>
+ 4, Run 'ctdb reloadnodes' to force all nodes to reload the nodesfile.
+ </para>
+ <para>
+ 5, Use 'ctdb status' on all nodes and verify that the deleted node no longer shows up in the list..
+ </para>
+ <para>
+ </para>
+
</refsect2>
<refsect2><title>tickle <srcip:port> <dstip:port></title>
diff --git a/include/ctdb.h b/include/ctdb.h
index 866ba76..ea4bcae 100644
--- a/include/ctdb.h
+++ b/include/ctdb.h
@@ -101,6 +101,11 @@ struct ctdb_call_info {
*/
#define CTDB_SRVID_PUSH_NODE_FLAGS 0xF900000000000000LL
+/*
+ a message ID to get the recovery daemon to reload the nodes file
+ */
+#define CTDB_SRVID_RELOAD_NODES 0xFA00000000000000LL
+
/* used on the domain socket, send a pdu to the local daemon */
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index ff007a8..98dab07 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -198,7 +198,8 @@ struct ctdb_node {
#define NODE_FLAGS_PERMANENTLY_DISABLED 0x00000004 /* administrator has disabled node */
#define NODE_FLAGS_BANNED 0x00000008 /* recovery daemon has banned the node */
#define NODE_FLAGS_DISABLED (NODE_FLAGS_UNHEALTHY|NODE_FLAGS_PERMANENTLY_DISABLED)
-#define NODE_FLAGS_INACTIVE (NODE_FLAGS_DISCONNECTED|NODE_FLAGS_BANNED)
+#define NODE_FLAGS_DELETED 0x00000010 /* this node has been deleted */
+#define NODE_FLAGS_INACTIVE (NODE_FLAGS_DELETED|NODE_FLAGS_DISCONNECTED|NODE_FLAGS_BANNED)
uint32_t flags;
/* used by the dead node monitoring */
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 029d742..b2f7efa 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -4,7 +4,7 @@ Summary: Clustered TDB
Vendor: Samba Team
Packager: Samba Team <samba at samba.org>
Name: ctdb
-Version: 1.0.82
+Version: 1.0.83
Release: 1
Epoch: 0
License: GNU GPL version 3
@@ -131,6 +131,30 @@ fi
%{_libdir}/pkgconfig/ctdb.pc
%changelog
+* Tue Jun 2 2009 : Version 1.0.83
+ - Document how to remove a ndoe from a running cluster.
+ - Hide all deleted nodes from ctdb output.
+ - Lower the loglevel on some eventscript related items
+ - Dont queue packets to deleted nodes
+ - When building initial vnnmap, ignode any nonexisting nodes
+ - Add a new nodestate : DELETED that is used when deleting a node from an
+ existing cluster.
+ - dont remove the ctdb socket when shutting down. This prevents a race in the
+ initscripts when restarting ctdb quickly after stopping it.
+ - TDB nesting reworked.
+ - Remove obsolete ipmux
+ - From Flavio Carmo Junior: Add eventscript and documentation for ClamAV antivirus engine
+ - From Sumit Bose: fix the regex in the test to handle the new ctdb
+ statistics output that was recently added.
+ - change the socket type we use for grauitious arps from the obsolete
+ AF_INET/SOCK_PACKET to instead use PF_PACKET/SOCK_RAW.
+ - Check return codes for some functions, from Sumit Bose, based on codereview by Jim Meyering.
+ - Sumit Bose: Remove structure memeber node_list_file that is no longer used.
+ - Sumit Bose: fix configure warning for netfilter.h
+ - Updates to the webpages by Volker.
+ - Remove error messages about missing /var/log/log.ctdb file from ctdb_diagnostics.sh from christian Ambach
+ - Additional error logs if hte eventscript switching from dameon to client mode fails.
+ - track how long it takes for ctdbd and the recovery daemon to perform the rec-lock fcntl() lock attemt and show this in the ctdb statistics output.
* Thu May 14 2009 : Version 1.0.82
- Update the "ctdb lvsmaster" command to return -1 on error.
- Add a -Y flag to "ctdb lvsmaster"
diff --git a/server/ctdb_keepalive.c b/server/ctdb_keepalive.c
index 524feb1..dfe7cfc 100644
--- a/server/ctdb_keepalive.c
+++ b/server/ctdb_keepalive.c
@@ -37,6 +37,11 @@ static void ctdb_check_for_dead_nodes(struct event_context *ev, struct timed_eve
/* send a keepalive to all other nodes, unless */
for (i=0;i<ctdb->num_nodes;i++) {
struct ctdb_node *node = ctdb->nodes[i];
+
+ if (node->flags & NODE_FLAGS_DELETED) {
+ continue;
+ }
+
if (node->pnn == ctdb->pnn) {
continue;
}
diff --git a/server/ctdb_recover.c b/server/ctdb_recover.c
index b4428fa..7953c6b 100644
--- a/server/ctdb_recover.c
+++ b/server/ctdb_recover.c
@@ -242,6 +242,10 @@ ctdb_reload_nodes_event(struct event_context *ev, struct timed_event *te,
continue;
}
+ if (ctdb->nodes[i]->flags & NODE_FLAGS_DELETED) {
+ continue;
+ }
+
/* any new or different nodes must be added */
if (ctdb->methods->add_node(ctdb->nodes[i]) != 0) {
DEBUG(DEBUG_CRIT, (__location__ " methods->add_node failed at %d\n", i));
@@ -253,6 +257,9 @@ ctdb_reload_nodes_event(struct event_context *ev, struct timed_event *te,
}
}
+ /* tell the recovery daemon to reaload the nodes file too */
+ ctdb_daemon_send_message(ctdb, ctdb->pnn, CTDB_SRVID_RELOAD_NODES, tdb_null);
+
talloc_free(tmp_ctx);
return;
}
diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index 995284f..6b2fb5e 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -1332,12 +1332,6 @@ static int do_recovery(struct ctdb_recoverd *rec,
DEBUG(DEBUG_NOTICE, (__location__ " Starting do_recovery\n"));
- if (ctdb->num_nodes != nodemap->num) {
- DEBUG(DEBUG_ERR, (__location__ " ctdb->num_nodes (%d) != nodemap->num (%d) reloading nodes file\n", ctdb->num_nodes, nodemap->num));
- reload_nodes_file(ctdb);
- return -1;
- }
-
/* if recovery fails, force it again */
rec->need_recovery = true;
@@ -1804,6 +1798,21 @@ DEBUG(DEBUG_ERR, ("recovery master memory dump\n"));
}
/*
+ handler for reload_nodes
+*/
+static void reload_nodes_handler(struct ctdb_context *ctdb, uint64_t srvid,
+ TDB_DATA data, void *private_data)
+{
+ struct ctdb_recoverd *rec = talloc_get_type(private_data, struct ctdb_recoverd);
+
+ DEBUG(DEBUG_ERR, (__location__ " Reload nodes file from recovery daemon\n"));
+
+ reload_nodes_file(rec->ctdb);
+}
+
+
+
+/*
handler for recovery master elections
*/
static void election_handler(struct ctdb_context *ctdb, uint64_t srvid,
@@ -2371,6 +2380,9 @@ static void monitor_cluster(struct ctdb_context *ctdb)
/* register a message port for vacuum fetch */
ctdb_set_message_handler(ctdb, CTDB_SRVID_VACUUM_FETCH, vacuum_fetch_handler, rec);
+ /* register a message port for reloadnodes */
+ ctdb_set_message_handler(ctdb, CTDB_SRVID_RELOAD_NODES, reload_nodes_handler, rec);
+
again:
if (mem_ctx) {
talloc_free(mem_ctx);
@@ -2591,14 +2603,16 @@ again:
goto again;
}
for (j=0; j<nodemap->num; j++) {
- if (nodemap->nodes[j].flags & NODE_FLAGS_INACTIVE) {
- continue;
- }
/* release any existing data */
if (ctdb->nodes[j]->public_ips) {
talloc_free(ctdb->nodes[j]->public_ips);
ctdb->nodes[j]->public_ips = NULL;
}
+
+ if (nodemap->nodes[j].flags & NODE_FLAGS_INACTIVE) {
+ continue;
+ }
+
/* grab a new shiny list of public ips from the node */
if (ctdb_ctrl_get_public_ips(ctdb, CONTROL_TIMEOUT(),
ctdb->nodes[j]->pnn,
diff --git a/server/ctdb_server.c b/server/ctdb_server.c
index bd1d7ed..59ed37c 100644
--- a/server/ctdb_server.c
+++ b/server/ctdb_server.c
@@ -45,6 +45,9 @@ int ctdb_ip_to_nodeid(struct ctdb_context *ctdb, const char *nodeip)
int nodeid;
for (nodeid=0;nodeid<ctdb->num_nodes;nodeid++) {
+ if (ctdb->nodes[nodeid]->flags & NODE_FLAGS_DELETED) {
+ continue;
+ }
if (!strcmp(ctdb->nodes[nodeid]->address.address, nodeip)) {
return nodeid;
}
@@ -89,7 +92,7 @@ int ctdb_set_tdb_dir_persistent(struct ctdb_context *ctdb, const char *dir)
}
/*
- add a node to the list of active nodes
+ add a node to the list of nodes
*/
static int ctdb_add_node(struct ctdb_context *ctdb, char *nstr)
{
@@ -137,13 +140,53 @@ static int ctdb_add_node(struct ctdb_context *ctdb, char *nstr)
}
/*
+ add an entry for a "deleted" node to the list of nodes.
+ a "deleted" node is a node that is commented out from the nodes file.
+ this is used to prevent that subsequent nodes in the nodes list
+ change their pnn value if a node is "delete" by commenting it out and then
+ using "ctdb reloadnodes" at runtime.
+*/
+static int ctdb_add_deleted_node(struct ctdb_context *ctdb)
+{
+ struct ctdb_node *node, **nodep;
+
+ nodep = talloc_realloc(ctdb, ctdb->nodes, struct ctdb_node *, ctdb->num_nodes+1);
+ CTDB_NO_MEMORY(ctdb, nodep);
+
+ ctdb->nodes = nodep;
+ nodep = &ctdb->nodes[ctdb->num_nodes];
+ (*nodep) = talloc_zero(ctdb->nodes, struct ctdb_node);
+ CTDB_NO_MEMORY(ctdb, *nodep);
+ node = *nodep;
+
+ if (ctdb_parse_address(ctdb, node, "0.0.0.0", &node->address) != 0) {
+ DEBUG(DEBUG_ERR,("Failed to setup deleted node %d\n", ctdb->num_nodes));
+ return -1;
+ }
--
CTDB repository
More information about the samba-cvs
mailing list