[SCM] CTDB repository - branch master updated - ctdb-1.0.78-3-g0889ae3

[Ronnie Sahlberg]

The branch, master has been updated
       via  0889ae3c237bdb3bd72d45f2f64f5e5d8420870c (commit)
       via  68eac459e5d2b6b534f72821036675ffe5d7a350 (commit)
       via  9ac9745ba9296d01e3b18148ae8c3240e51cf090 (commit)
      from  00d2213613822b758939019361a619bd7d7f4984 (commit)

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


- Log -----------------------------------------------------------------
commit 0889ae3c237bdb3bd72d45f2f64f5e5d8420870c
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu Apr 2 14:50:43 2009 +1100

    if we cant pull the remote nodemap off a node we should mark it as a culprit so it eventually becomes banned.

commit 68eac459e5d2b6b534f72821036675ffe5d7a350
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Apr 1 17:21:38 2009 +1100

    Change the (dodgy) seqnumfrequency variable to have ms resolution instead of second resolution.
    
    Rename the variable to SeqnumInterval for
    1, it is an interval and not a 1/interval unit
    2, so that we catch when people use this old variable and can update the sysconfig file instead of silently changin semantics of this variable
    
    this is a real dodgy variable

commit 9ac9745ba9296d01e3b18148ae8c3240e51cf090
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Apr 1 17:13:48 2009 +1100

    remove a prototype for a function no longer used

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

Summary of changes:
 include/ctdb_private.h    |    3 +--
 server/ctdb_ltdb_server.c |    4 ++--
 server/ctdb_recoverd.c    |    2 ++
 server/ctdb_tunables.c    |    2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index cf93eed..88e686b 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -77,7 +77,7 @@ struct ctdb_tcp_array {
 /* all tunable variables go in here */
 struct ctdb_tunable {
 	uint32_t max_redirect_count;
-	uint32_t seqnum_frequency;
+	uint32_t seqnum_interval; /* unit is ms */
 	uint32_t control_timeout;
 	uint32_t traverse_timeout;
 	uint32_t keepalive_interval;
@@ -1128,7 +1128,6 @@ int daemon_deregister_message_handler(struct ctdb_context *ctdb, uint32_t client
 
 int32_t ctdb_ltdb_enable_seqnum(struct ctdb_context *ctdb, uint32_t db_id);
 int32_t ctdb_ltdb_update_seqnum(struct ctdb_context *ctdb, uint32_t db_id, uint32_t srcnode);
-int32_t ctdb_ltdb_set_seqnum_frequency(struct ctdb_context *ctdb, uint32_t frequency);
 
 struct ctdb_rec_data *ctdb_marshall_record(TALLOC_CTX *mem_ctx, uint32_t reqid,	
 					   TDB_DATA key, struct ctdb_ltdb_header *, TDB_DATA data);
diff --git a/server/ctdb_ltdb_server.c b/server/ctdb_ltdb_server.c
index 3521250..b330768 100644
--- a/server/ctdb_ltdb_server.c
+++ b/server/ctdb_ltdb_server.c
@@ -455,7 +455,7 @@ static void ctdb_ltdb_seqnum_check(struct event_context *ev, struct timed_event
 	/* setup a new timer */
 	ctdb_db->te = 
 		event_add_timed(ctdb->ev, ctdb_db, 
-				timeval_current_ofs(ctdb->tunable.seqnum_frequency, 0),
+				timeval_current_ofs(ctdb->tunable.seqnum_interval/1000, (ctdb->tunable.seqnum_interval%1000)*1000),
 				ctdb_ltdb_seqnum_check, ctdb_db);
 }
 
@@ -474,7 +474,7 @@ int32_t ctdb_ltdb_enable_seqnum(struct ctdb_context *ctdb, uint32_t db_id)
 	if (ctdb_db->te == NULL) {
 		ctdb_db->te = 
 			event_add_timed(ctdb->ev, ctdb_db, 
-					timeval_current_ofs(ctdb->tunable.seqnum_frequency, 0),
+					timeval_current_ofs(ctdb->tunable.seqnum_interval/1000, (ctdb->tunable.seqnum_interval%1000)*1000),
 					ctdb_ltdb_seqnum_check, ctdb_db);
 	}
 
diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index 28be460..ef610a3 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -2663,6 +2663,8 @@ again:
 
 		if (remote_nodemaps[j] == NULL) {
 			DEBUG(DEBUG_ERR,(__location__ " Did not get a remote nodemap for node %d, restarting monitoring\n", j));
+			ctdb_set_culprit(rec, j);
+
 			goto again;
 		}
 
diff --git a/server/ctdb_tunables.c b/server/ctdb_tunables.c
index f758c2c..31ec89f 100644
--- a/server/ctdb_tunables.c
+++ b/server/ctdb_tunables.c
@@ -25,7 +25,7 @@ static const struct {
 	size_t offset;	
 } tunable_map[] = {
 	{ "MaxRedirectCount",     3,  offsetof(struct ctdb_tunable, max_redirect_count) },
-	{ "SeqnumFrequency",      1,  offsetof(struct ctdb_tunable, seqnum_frequency) },
+	{ "SeqnumInterval",      1000,  offsetof(struct ctdb_tunable, seqnum_interval) },
 	{ "ControlTimeout",      60, offsetof(struct ctdb_tunable, control_timeout) },
 	{ "TraverseTimeout",     20, offsetof(struct ctdb_tunable, traverse_timeout) },
 	{ "KeepaliveInterval",    5,  offsetof(struct ctdb_tunable, keepalive_interval) },


-- 
CTDB repository