[SCM] CTDB repository - branch master updated - ctdb-1.0.108-77-gb883d19

[Ronnie Sahlberg]

The branch, master has been updated
       via  b883d19a495a41a22db37f9c2cf6250fee529de0 (commit)
      from  b765e12a5fb87a6121e49b349017b6a961929346 (commit)

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


- Log -----------------------------------------------------------------
commit b883d19a495a41a22db37f9c2cf6250fee529de0
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Dec 16 09:51:17 2009 +1100

    Revert "cleanup:   remove a tunable we no longer use in the eventscripts any more :"
    
    This reverts commit 401f421fa003d9515df15e759b50b56e0c67d69c.
    
    Conflicts:
    
    	include/ctdb_private.h
    	server/ctdb_tunables.c

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

Summary of changes:
 include/ctdb_private.h |    1 +
 server/ctdb_tunables.c |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index b6c4b2f..feff0bc 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -104,6 +104,7 @@ struct ctdb_tunable {
 	uint32_t tickle_update_interval;
 	uint32_t script_timeout;
 	uint32_t script_timeout_count; /* allow dodgy scripts to hang this many times in a row before we mark the node unhealthy */
+	uint32_t script_unhealthy_on_timeout; /* obsolete */
 	uint32_t recovery_grace_period;
 	uint32_t recovery_ban_period;
 	uint32_t database_hash_size;
diff --git a/server/ctdb_tunables.c b/server/ctdb_tunables.c
index 8722603..17949d1 100644
--- a/server/ctdb_tunables.c
+++ b/server/ctdb_tunables.c
@@ -39,6 +39,7 @@ static const struct {
 	{ "TickleUpdateInterval",20,  offsetof(struct ctdb_tunable, tickle_update_interval) },
 	{ "EventScriptTimeout",  30,  offsetof(struct ctdb_tunable, script_timeout) },
 	{ "EventScriptTimeoutCount", 1,  offsetof(struct ctdb_tunable, script_timeout_count) },
+	{ "EventScriptUnhealthyOnTimeout", 0, offsetof(struct ctdb_tunable, script_unhealthy_on_timeout) },/* OBSOLETE */
 	{ "RecoveryGracePeriod", 120,  offsetof(struct ctdb_tunable, recovery_grace_period) },
 	{ "RecoveryBanPeriod",  300,  offsetof(struct ctdb_tunable, recovery_ban_period) },
 	{ "DatabaseHashSize", 10000,  offsetof(struct ctdb_tunable, database_hash_size) },


-- 
CTDB repository