[SCM] CTDB repository - branch 1.0.112 updated - ctdb-1.0.111-39-g2dab89c

[Ronnie Sahlberg]

The branch, 1.0.112 has been updated
       via  2dab89cc2e57e683272121456b23aa96cd51461b (commit)
       via  527597ed6d9142c0b47a9c419c828793826ac95e (commit)
      from  a14e49ac60e341ff6daa7fd33e4c62415e6d2c0b (commit)

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


- Log -----------------------------------------------------------------
commit 2dab89cc2e57e683272121456b23aa96cd51461b
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Feb 16 11:20:19 2010 +1100

    new version 1.0.112-9

commit 527597ed6d9142c0b47a9c419c828793826ac95e
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Feb 16 11:18:43 2010 +1100

    Ignore any scripts that timesout for most events, except startup.
    
    Threat hung scripts always (except startup) as success.

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

Summary of changes:
 packaging/RPM/ctdb.spec.in |    4 +++-
 server/eventscript.c       |   16 +++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index ceeb327..de15224 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -5,7 +5,7 @@ Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
 Version: 1.0.112
-Release: 8
+Release: 9
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -123,6 +123,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_docdir}/ctdb/tests/bin/ctdb_transaction
 
 %changelog
+* Tue Feb 16 2010 : Version 1.0.112-9
+ - treat all scripts that hang (except for startup) as success even if they hung
 * Mon Feb 15 2010 : Version 1.0.112-8
  - dont increase the tdb seqnum when we just do a dmsater migration
    this prevents trashing for notify.tdb and registry.tdb since
diff --git a/server/eventscript.c b/server/eventscript.c
index e0908e1..8cac635 100644
--- a/server/eventscript.c
+++ b/server/eventscript.c
@@ -516,7 +516,21 @@ static void ctdb_event_script_timeout(struct event_context *ev, struct timed_eve
 	DEBUG(DEBUG_ERR,("Event script timed out : %s %s %s count : %u  pid : %d\n",
 			 current->name, ctdb_eventscript_call_names[state->call], state->options, ctdb->event_script_timeouts, state->child));
 
-	state->scripts->scripts[state->current].status = -ETIME;
+	/* ignore timeouts for these events */
+	switch (state->call) {
+	case CTDB_EVENT_START_RECOVERY:
+	case CTDB_EVENT_RECOVERED:
+	case CTDB_EVENT_TAKE_IP:
+	case CTDB_EVENT_RELEASE_IP:
+	case CTDB_EVENT_STOPPED:
+	case CTDB_EVENT_MONITOR:
+	case CTDB_EVENT_STATUS:
+		state->scripts->scripts[state->current].status = 0;
+		DEBUG(DEBUG_ERR,("Ignoring hung script for %s call %d\n", state->options, state->call));
+		break;
+        default:
+		state->scripts->scripts[state->current].status = -ETIME;
+	}
 
 	if (kill(state->child, 0) != 0) {
 		DEBUG(DEBUG_ERR,("Event script child process already dead, errno %s(%d)\n", strerror(errno), errno));


-- 
CTDB repository