diff options
author | Martin Schwenke <martin@meltin.net> | 2013-01-11 18:02:51 +1100 |
---|---|---|
committer | Amitay Isaacs <amitay@gmail.com> | 2013-05-24 14:08:07 +1000 |
commit | 94b0e8dfebbe9e46d1e58215c8da5854fbe21fde (patch) | |
tree | 42a58fb4c024d7515706dc8697403bb472b99ca8 /ctdb/server/ctdb_daemon.c | |
parent | a989a299d196ac6cb2de17cfacf26c5075e0d853 (diff) | |
download | samba-94b0e8dfebbe9e46d1e58215c8da5854fbe21fde.tar.gz samba-94b0e8dfebbe9e46d1e58215c8da5854fbe21fde.tar.xz samba-94b0e8dfebbe9e46d1e58215c8da5854fbe21fde.zip |
ctdbd: When the "setup" event fails log an error and exit, don't abort
The "setup" event can fail when one of the eventscripts fails to run
its "setup" event. If this occurs then the eventscript should log an
error. The stack trace and core file generated when we abort provides
no useful information.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit c50eca6fbf49a6c7bf50905334704f8d2d3237d7)
Diffstat (limited to 'ctdb/server/ctdb_daemon.c')
-rw-r--r-- | ctdb/server/ctdb_daemon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index 32c30243ea6..cedee09a02f 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -1032,8 +1032,8 @@ static void ctdb_setup_event_callback(struct ctdb_context *ctdb, int status, void *private_data) { if (status != 0) { - ctdb_fatal(ctdb, "Failed to run setup event\n"); - return; + DEBUG(DEBUG_ALERT,("Failed to run setup event - exiting\n")); + exit(1); } ctdb_run_notification_script(ctdb, "setup"); |