database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fix Bug #19368 Failure in "flush_instances" causes assert in Thread_registry

Browse Source 
Stop guardian and all the rest of threads before shutdown in case of an error
This commit is contained in:
petr/cps@mysql.com/owlet.local
2006-10-05 22:07:21 +04:00
parent 2073e4a1cb
commit 96c6f6f5c2
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server-tools/instance-manager/instance_map.cc
View File

@@ -215,7 +215,9 @@ int Instance_map::flush_instances()
hash_init(&hash, default_charset_info, START_HASH_SIZE, 0, 0, hash_init(&hash, default_charset_info, START_HASH_SIZE, 0, 0,
get_instance_key, delete_instance, 0); get_instance_key, delete_instance, 0);
rc= load(); rc= load();
guardian->init(); // TODO: check error status. /* don't init guardian if we failed to load instances */
if (!rc)
guardian->init(); // TODO: check error status.
pthread_mutex_unlock(&LOCK_instance_map); pthread_mutex_unlock(&LOCK_instance_map);
guardian->unlock(); guardian->unlock();
return rc; return rc;

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

@@ -104,6 +104,19 @@ int my_sigwait(const sigset_t *set, int *sig)
#endif #endif
void stop_all(Guardian_thread *guardian, Thread_registry *registry)
{
/*
Let guardian thread know that it should break it's processing cycle,
once it wakes up.
*/
guardian->request_shutdown(true);
/* wake guardian */
pthread_cond_signal(&guardian->COND_guardian);
/* stop all threads */
registry->deliver_shutdown();
}
/* /*
manager - entry point to the main instance manager process: start manager - entry point to the main instance manager process: start
listener thread, write pid file and enter into signal handling. listener thread, write pid file and enter into signal handling.
@@ -210,7 +223,8 @@ void manager(const Options &options)
log_error("Cannot init instances repository. This might be caused by " log_error("Cannot init instances repository. This might be caused by "
"the wrong config file options. For instance, missing mysqld " "the wrong config file options. For instance, missing mysqld "
"binary. Aborting."); "binary. Aborting.");
return; stop_all(&guardian_thread, &thread_registry);
goto err;
} }
/* create the listener */ /* create the listener */
@@ -227,6 +241,7 @@ void manager(const Options &options)
if (rc) if (rc)
{ {
log_error("manager(): set_stacksize_n_create_thread(listener) failed"); log_error("manager(): set_stacksize_n_create_thread(listener) failed");
stop_all(&guardian_thread, &thread_registry);
goto err; goto err;
} }
@@ -245,6 +260,7 @@ void manager(const Options &options)
if ((status= my_sigwait(&mask, &signo)) != 0) if ((status= my_sigwait(&mask, &signo)) != 0)
{ {
log_error("sigwait() failed"); log_error("sigwait() failed");
stop_all(&guardian_thread, &thread_registry);
goto err; goto err;
} }