sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-08 04:58:40 +03:00
Code

prevent a deadly embrace between smbd and ctdbd by moving the calling

Browse Source 
of the startup event scripts after the point where recovery has
started and the node is in normal operation

This makes the 'startup' script just a special type of the 'monitor'
script which is called first

(This used to be ctdb commit 7424c30a5fd04aea0137c466b4318c3f185280d8)
This commit is contained in:
Andrew Tridgell 2007-11-12 10:53:11 +11:00
parent 82bd652749
commit bde886988b
3 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ctdb/include/ctdb_private.h
View File

@ -366,6 +366,7 @@ struct ctdb_context {
const char *event_script_dir;
const char *default_public_interface;
pid_t recoverd_pid;
bool done_startup;
};
struct ctdb_db_context {

15
ctdb/server/ctdb_daemon.c
View File

@ -68,13 +68,8 @@ static void print_exit_message(void)
/* called when the "startup" event script has finished */
static void ctdb_start_transport(struct ctdb_context *ctdb, int status, void *p)
static void ctdb_start_transport(struct ctdb_context *ctdb)
{
if (status != 0) {
DEBUG(0,("startup event failed!\n"));
ctdb_fatal(ctdb, "startup event script failed");
}
/* start the transport running */
if (ctdb->methods->start(ctdb) != 0) {
DEBUG(0,("transport failed to start!\n"));
@ -664,12 +659,8 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork)
/* release any IPs we hold from previous runs of the daemon */
ctdb_release_all_ips(ctdb);
ret = ctdb_event_script_callback(ctdb, timeval_zero(), ctdb,
ctdb_start_transport, NULL, "startup");
if (ret != 0) {
DEBUG(0,("Failed startup event script\n"));
return -1;
}
/* start the transport going */
ctdb_start_transport(ctdb);
/* go into a wait loop to allow other nodes to complete */
event_loop_wait(ctdb->ev);

42
ctdb/server/ctdb_monitor.c
View File

@ -137,6 +137,31 @@ static void ctdb_health_callback(struct ctdb_context *ctdb, int status, void *p)
}
/*
called when the startup event script finishes
*/
static void ctdb_startup_callback(struct ctdb_context *ctdb, int status, void *p)
{
if (status != 0) {
DEBUG(0,("startup event failed\n"));
} else if (status == 0) {
DEBUG(0,("startup event OK - enabling monitoring\n"));
ctdb->done_startup = true;
}
if (ctdb->done_startup) {
event_add_timed(ctdb->ev, ctdb->monitor_context,
timeval_zero(),
ctdb_check_health, ctdb);
} else {
event_add_timed(ctdb->ev, ctdb->monitor_context,
timeval_current_ofs(ctdb->tunable.monitor_interval, 0),
ctdb_check_health, ctdb);
}
}
/*
see if the event scripts think we are healthy
*/
@ -146,16 +171,25 @@ static void ctdb_check_health(struct event_context *ev, struct timed_event *te,
struct ctdb_context *ctdb = talloc_get_type(private_data, struct ctdb_context);
int ret;
if (ctdb->monitoring_mode == CTDB_MONITORING_DISABLED) {
if (ctdb->monitoring_mode == CTDB_MONITORING_DISABLED && ctdb->done_startup) {
event_add_timed(ctdb->ev, ctdb->monitor_context,
timeval_current_ofs(ctdb->tunable.monitor_interval, 0),
ctdb_check_health, ctdb);
return;
}
ret = ctdb_event_script_callback(ctdb,
timeval_current_ofs(ctdb->tunable.script_timeout, 0),
ctdb->monitor_context, ctdb_health_callback, ctdb, "monitor");
if (!ctdb->done_startup) {
ret = ctdb_event_script_callback(ctdb,
timeval_current_ofs(ctdb->tunable.script_timeout, 0),
ctdb->monitor_context, ctdb_startup_callback,
ctdb, "startup");
} else {
ret = ctdb_event_script_callback(ctdb,
timeval_current_ofs(ctdb->tunable.script_timeout, 0),
ctdb->monitor_context, ctdb_health_callback,
ctdb, "monitor");
}
if (ret != 0) {
DEBUG(0,("Unable to launch monitor event script\n"));
event_add_timed(ctdb->ev, ctdb->monitor_context,