summaryrefslogtreecommitdiff
path: root/ctdb
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2018-10-11 11:26:06 +1100
committerKarolin Seeger <kseeger@samba.org>2018-10-29 09:26:13 +0100
commit1e07fa98de696165a2391b0c5b58a990e61abcda (patch)
tree383b853ffa883e3171c6ff9afabc0806c3f9dd0e /ctdb
parent995a75e4b65d6fbbec808bb395e5c180e55af8ca (diff)
downloadsamba-1e07fa98de696165a2391b0c5b58a990e61abcda.tar.gz
ctdb-daemon: Exit if eventd goes away
ctdbd enters a broken state if eventd goes away. A clean shutdown is not possible because that involves running events. Restarting eventd is possible but this might mask a serious problem and it is possible that eventd might keep on disappearing. Just exit. BUG: https://bugzilla.samba.org/show_bug.cgi?id=13659 Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com> (cherry picked from commit c9e1603a5d0c1a216439d4a2b0e7cdc05181e898)
Diffstat (limited to 'ctdb')
-rw-r--r--ctdb/server/eventscript.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index 1f70ef5addf..4a680044c25 100644
--- a/ctdb/server/eventscript.c
+++ b/ctdb/server/eventscript.c
@@ -370,13 +370,8 @@ static void eventd_dead_handler(struct tevent_context *ev,
struct tevent_fd *fde, uint16_t flags,
void *private_data)
{
- struct eventd_context *ectx = talloc_get_type_abort(
- private_data, struct eventd_context);
-
- DEBUG(DEBUG_ERR, ("Eventd went away\n"));
-
- TALLOC_FREE(ectx->eventd_fde);
- ectx->eventd_pid = -1;
+ D_ERR("Eventd went away - exiting\n");
+ exit(1);
}
void ctdb_stop_eventd(struct ctdb_context *ctdb)