diff options
| -rw-r--r-- | ctdb/client/ctdb_client.c | 1 | ||||
| -rw-r--r-- | ctdb/lib/tevent/tevent.h | 2 | ||||
| -rw-r--r-- | ctdb/server/ctdb_daemon.c | 1 | ||||
| -rw-r--r-- | ctdb/server/ctdb_logging.c | 1 | ||||
| -rw-r--r-- | ctdb/server/ctdbd.c | 1 | ||||
| -rw-r--r-- | ctdb/tools/ctdb.c | 1 |
6 files changed, 7 insertions, 0 deletions
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 1d854d15c53..51830abf55d 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -3839,6 +3839,7 @@ int switch_from_server_to_client(struct ctdb_context *ctdb) /* get a new event context */ talloc_free(ctdb->ev); ctdb->ev = event_context_init(ctdb); + tevent_loop_allow_nesting(ctdb->ev); close(ctdb->daemon.sd); ctdb->daemon.sd = -1; diff --git a/ctdb/lib/tevent/tevent.h b/ctdb/lib/tevent/tevent.h index c2aead22913..d3bf3666d5f 100644 --- a/ctdb/lib/tevent/tevent.h +++ b/ctdb/lib/tevent/tevent.h @@ -28,6 +28,8 @@ #ifndef __TEVENT_H__ #define __TEVENT_H__ +#define TEVENT_DEPRECATED + #include <stdint.h> #include <talloc.h> #include <sys/time.h> diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index 517ad9ba12c..1d803058e98 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -773,6 +773,7 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog) } ctdb->ev = event_context_init(NULL); + tevent_loop_allow_nesting(ctdb->ev); ctdb_set_child_logging(ctdb); diff --git a/ctdb/server/ctdb_logging.c b/ctdb/server/ctdb_logging.c index 4680c32b076..ee4499ca1af 100644 --- a/ctdb/server/ctdb_logging.c +++ b/ctdb/server/ctdb_logging.c @@ -118,6 +118,7 @@ int start_syslog_daemon(struct ctdb_context *ctdb) talloc_free(ctdb->ev); ctdb->ev = event_context_init(NULL); + tevent_loop_allow_nesting(ctdb->ev); syslog(LOG_ERR, "Starting SYSLOG daemon with pid:%d", (int)getpid()); diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index b0b075c4f31..89b9af179bc 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -178,6 +178,7 @@ int main(int argc, const char *argv[]) fault_setup("ctdbd"); ev = event_context_init(NULL); + tevent_loop_allow_nesting(ev); ctdb = ctdb_cmdline_init(ev); diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index e915e0099dd..a65c525faba 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -4534,6 +4534,7 @@ int main(int argc, const char *argv[]) DEBUG(DEBUG_ERR, ("Failed to initialize event system\n")); exit(1); } + tevent_loop_allow_nesting(ev); for (i=0;i<ARRAY_SIZE(ctdb_commands);i++) { if (strcmp(control, ctdb_commands[i].name) == 0) { |