From 6acdc271f21b5e1d45fe33bc0254c61761db2abd Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 5 Oct 2006 01:24:53 +0400 Subject: [PATCH 1/2] Fix Bug #22472 IM: --socket option should be removed from Windows version the option is useless on windows. It was removed from listing of mysqlmanager --help on Windows server-tools/instance-manager/options.cc: move socket_file_name under unix-specific define server-tools/instance-manager/options.h: move socket_file_name under unix-specific define --- server-tools/instance-manager/options.cc | 4 ++-- server-tools/instance-manager/options.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server-tools/instance-manager/options.cc b/server-tools/instance-manager/options.cc index a98c0e291be..c6c709295bc 100644 --- a/server-tools/instance-manager/options.cc +++ b/server-tools/instance-manager/options.cc @@ -45,10 +45,10 @@ const char *default_password_file_name= QUOTE(DEFAULT_PASSWORD_FILE_NAME); const char *default_log_file_name= QUOTE(DEFAULT_LOG_FILE_NAME); const char *Options::config_file= QUOTE(DEFAULT_CONFIG_FILE); const char *Options::angel_pid_file_name= NULL; +const char *Options::socket_file_name= QUOTE(DEFAULT_SOCKET_FILE_NAME); #endif const char *Options::log_file_name= default_log_file_name; const char *Options::pid_file_name= QUOTE(DEFAULT_PID_FILE_NAME); -const char *Options::socket_file_name= QUOTE(DEFAULT_SOCKET_FILE_NAME); const char *Options::password_file_name= default_password_file_name; const char *Options::default_mysqld_path= QUOTE(DEFAULT_MYSQLD_PATH); const char *Options::bind_address= 0; /* No default value */ @@ -106,11 +106,11 @@ static struct my_option my_long_options[] = (gptr *) &Options::angel_pid_file_name, (gptr *) &Options::angel_pid_file_name, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, -#endif { "socket", OPT_SOCKET, "Socket file to use for connection.", (gptr *) &Options::socket_file_name, (gptr *) &Options::socket_file_name, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, +#endif { "passwd", 'P', "Prepare entry for passwd file and exit.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }, diff --git a/server-tools/instance-manager/options.h b/server-tools/instance-manager/options.h index ad3458869b6..f32e106bd7a 100644 --- a/server-tools/instance-manager/options.h +++ b/server-tools/instance-manager/options.h @@ -36,11 +36,11 @@ struct Options static char run_as_service; /* handle_options doesn't support bool */ static const char *user; static const char *angel_pid_file_name; + static const char *socket_file_name; #endif static bool is_forced_default_file; static const char *log_file_name; static const char *pid_file_name; - static const char *socket_file_name; static const char *password_file_name; static const char *default_mysqld_path; /* the option which should be passed to process_default_option_files */ From 777bab9853a950b37b752bfc9c757ec0fdfa7fe0 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 5 Oct 2006 22:07:21 +0400 Subject: [PATCH 2/2] Fix Bug #19368 Failure in "flush_instances" causes assert in Thread_registry Stop guardian and all the rest of threads before shutdown in case of an error server-tools/instance-manager/instance_map.cc: flush_instances shouldn't reinit guardian, if it failed to load info about them server-tools/instance-manager/manager.cc: On error we should 1) stop guardian 2) terminate all other threads and exit --- server-tools/instance-manager/instance_map.cc | 4 +++- server-tools/instance-manager/manager.cc | 18 +++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/server-tools/instance-manager/instance_map.cc b/server-tools/instance-manager/instance_map.cc index 3b7f58d8a09..f6662847440 100644 --- a/server-tools/instance-manager/instance_map.cc +++ b/server-tools/instance-manager/instance_map.cc @@ -215,7 +215,9 @@ int Instance_map::flush_instances() hash_init(&hash, default_charset_info, START_HASH_SIZE, 0, 0, get_instance_key, delete_instance, 0); 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); guardian->unlock(); return rc; diff --git a/server-tools/instance-manager/manager.cc b/server-tools/instance-manager/manager.cc index 353dfcf64dc..6f28c39da77 100644 --- a/server-tools/instance-manager/manager.cc +++ b/server-tools/instance-manager/manager.cc @@ -104,6 +104,19 @@ int my_sigwait(const sigset_t *set, int *sig) #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 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 " "the wrong config file options. For instance, missing mysqld " "binary. Aborting."); - return; + stop_all(&guardian_thread, &thread_registry); + goto err; } /* create the listener */ @@ -227,6 +241,7 @@ void manager(const Options &options) if (rc) { log_error("manager(): set_stacksize_n_create_thread(listener) failed"); + stop_all(&guardian_thread, &thread_registry); goto err; } @@ -245,6 +260,7 @@ void manager(const Options &options) if ((status= my_sigwait(&mask, &signo)) != 0) { log_error("sigwait() failed"); + stop_all(&guardian_thread, &thread_registry); goto err; }