Revert "Ignore any scripts that timesout for most events, except startup."

This reverts commit b6d939c9758c7d2e39206838492f2f644dd61db7.

It's a bad idea to ignore hanging scripts, there must be something
wrong if that happens!

metze

Signed-off-by: Michael Adam <obnox@samba.org>

diff --git a/server/eventscript.c b/server/eventscript.c
index d1effbe7ae3ab359be95d3ad4a31df1a782630ab..757b2546a342781dfa42582488feaf361a91b3d1 100644 (file)
--- a/server/eventscript.c
+++ b/server/eventscript.c
@@ -516,21 +516,7 @@ 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));
 
-       /* 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;
-       }
+       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));