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

This reverts commit 527597ed6d9142c0b47a9c419c828793826ac95e.

diff --git a/server/eventscript.c b/server/eventscript.c
index 8cac6355973625e0686bfe4cfeb5040b00815bcf..e0908e183d30dfd98da009743ec2d969b0ed55b7 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));