[SCM] CTDB repository - branch master updated - ctdb-1.0.65-2-g7a18f33

Ronnie Sahlberg sahlberg at samba.org
Thu Nov 20 02:44:33 GMT 2008

The branch, master has been updated
       via  7a18f33ec7512100dd067c65f0470889ff8fd591 (commit)
      from  a9a1156ea4e10483a4bf4265b8e9203f0af033aa (commit)


- Log -----------------------------------------------------------------
commit 7a18f33ec7512100dd067c65f0470889ff8fd591
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Nov 20 13:35:08 2008 +1100

    Keepalive packets were only sent every KeepaliveInterval if the socket
    had been completely idle during that interval.
    If we had been sending other packets such as Messages, Calls or Controls
    there wouldnt be any need for an explicit keepalive and thus we didnt
    send one.
    This does make it somewhat awkward when analyzing traces since it is
    non-intuitive when keepalives are sent and when they are not sent.
    Change the keepalive logic to always send a keepalive regardless of
    whether the link is idle or not.


Summary of changes:
 server/ctdb_keepalive.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

Changeset truncated at 500 lines:

diff --git a/server/ctdb_keepalive.c b/server/ctdb_keepalive.c
index 1e46f5f..524feb1 100644
--- a/server/ctdb_keepalive.c
+++ b/server/ctdb_keepalive.c
@@ -68,10 +68,8 @@ static void ctdb_check_for_dead_nodes(struct event_context *ev, struct timed_eve
-		if (node->tx_cnt == 0) {
-			DEBUG(DEBUG_DEBUG,("sending keepalive to %u\n", node->pnn));
-			ctdb_send_keepalive(ctdb, node->pnn);
-		}
+		DEBUG(DEBUG_DEBUG,("sending keepalive to %u\n", node->pnn));
+		ctdb_send_keepalive(ctdb, node->pnn);
 		node->tx_cnt = 0;

CTDB repository

More information about the samba-cvs mailing list