1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into  mysql.com:/usr/home/ram/work/mysql-5.0
This commit is contained in:
unknown 2006-05-30 14:47:07 +05:00
commit 8a5ca696ec
3 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/t/rpl_insert_id.test
View File

@ -148,3 +148,5 @@ drop function bug15728_insert;
drop table t1, t2; drop table t1, t2;
# End of 5.0 tests # End of 5.0 tests
sync_slave_with_master;

22
server-tools/instance-manager/guardian.cc
View File

@ -139,9 +139,12 @@ void Guardian_thread::process_instance(Instance *instance,
case JUST_CRASHED: case JUST_CRASHED:
if (current_time - current_node->crash_moment <= 2) if (current_time - current_node->crash_moment <= 2)
{ {
instance->start(); if (instance->is_crashed())
log_info("guardian: starting instance %s", {
instance->options.instance_name); instance->start();
log_info("guardian: starting instance %s",
instance->options.instance_name);
}
} }
else else
current_node->state= CRASHED; current_node->state= CRASHED;
@ -152,11 +155,14 @@ void Guardian_thread::process_instance(Instance *instance,
{ {
if ((current_node->restart_counter < restart_retry)) if ((current_node->restart_counter < restart_retry))
{ {
instance->start(); if (instance->is_crashed())
current_node->last_checked= current_time; {
current_node->restart_counter++; instance->start();
log_info("guardian: restarting instance %s", current_node->last_checked= current_time;
instance->options.instance_name); current_node->restart_counter++;
log_info("guardian: restarting instance %s",
instance->options.instance_name);
}
} }
else else
current_node->state= CRASHED_AND_ABANDONED; current_node->state= CRASHED_AND_ABANDONED;

46
server-tools/instance-manager/manager.cc
View File

@ -147,28 +147,6 @@ void manager(const Options &options)
if (create_pid_file(options.pid_file_name, manager_pid)) if (create_pid_file(options.pid_file_name, manager_pid))
return; return;
sigset_t mask;
set_signals(&mask);
/* create the listener */
{
pthread_t listener_thd_id;
pthread_attr_t listener_thd_attr;
int rc;
pthread_attr_init(&listener_thd_attr);
pthread_attr_setdetachstate(&listener_thd_attr, PTHREAD_CREATE_DETACHED);
rc= set_stacksize_n_create_thread(&listener_thd_id, &listener_thd_attr,
listener, &listener_args);
pthread_attr_destroy(&listener_thd_attr);
if (rc)
{
log_error("manager(): set_stacksize_n_create_thread(listener) failed");
goto err;
}
}
/* create guardian thread */ /* create guardian thread */
{ {
pthread_t guardian_thd_id; pthread_t guardian_thd_id;
@ -211,6 +189,30 @@ void manager(const Options &options)
return; return;
} }
/* Initialize signals and alarm-infrastructure. */
sigset_t mask;
set_signals(&mask);
/* create the listener */
{
pthread_t listener_thd_id;
pthread_attr_t listener_thd_attr;
int rc;
pthread_attr_init(&listener_thd_attr);
pthread_attr_setdetachstate(&listener_thd_attr, PTHREAD_CREATE_DETACHED);
rc= set_stacksize_n_create_thread(&listener_thd_id, &listener_thd_attr,
listener, &listener_args);
pthread_attr_destroy(&listener_thd_attr);
if (rc)
{
log_error("manager(): set_stacksize_n_create_thread(listener) failed");
goto err;
}
}
/* /*
After the list of guarded instances have been initialized, After the list of guarded instances have been initialized,
Guardian should start them. Guardian should start them.