[SCM] CTDB repository - branch 1.0.64 updated - ctdb-1.0.64-4-gbd6871b

[Ronnie Sahlberg]

The branch, 1.0.64 has been updated
       via  bd6871bb020841a806bd3af7c45707cef295ab13 (commit)
       via  2c83a929959ff51ef746443bc66231568849aa08 (commit)
      from  27d0708eaf67e88ec2344a194b6a6ccb69588d37 (commit)

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


- Log -----------------------------------------------------------------
commit bd6871bb020841a806bd3af7c45707cef295ab13
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Nov 27 11:48:43 2008 +1100

    inew version 1.0.64-2

commit 2c83a929959ff51ef746443bc66231568849aa08
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:
 packaging/RPM/ctdb.spec |    4 +++-
 server/ctdb_keepalive.c |    6 ++----
 2 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 76d6978..dc3531e 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -5,7 +5,7 @@ Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
 Version: 1.0
-Release: 64_1
+Release: 64_2
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -120,6 +120,8 @@ fi
 %{_includedir}/ctdb_private.h
 
 %changelog
+* Thu Nov 27 2008 : Version 1.0.64-2
+ - Always send keepalive packets on the links, even if they are not idle.
 * Fri Nov 21 2008 : Version 1.0.64-1
  - In some situations when a node dissapears from the cluster it may take
    very long for GPFS to recover and allow fcntl() locking of the 
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
 			continue;
 		}
 		
-		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