mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 19:41:47 +01:00
8b4fcf6e3b
- WL#3158: IM: Instance configuration extensions; - WL#3159: IM: --bootstrap and --start-default-instance modes The following new statements have been added: - CREATE INSTANCE; - DROP INSTANCE; The behaviour of the following statements have been changed: - SET; - UNSET; - FLUSH INSTANCES; - SHOW INSTANCES; - SHOW INSTANCE OPTIONS; BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833: Delete: mysql-test/t/im_options_set.imtest BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921: Delete: mysql-test/r/im_options_set.result BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048: Delete: mysql-test/t/im_options_unset.imtest BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f: Delete: mysql-test/r/im_options_unset.result client/get_password.c: Change prototype to avoid casting when using C-strings (char *). include/m_string.h: Moved LEX_STRING to global header from sql/ to be accessible from all components (IM for one). include/my_sys.h: Added constants for modify_defaults_file(). include/mysql_com.h: Removed duplicated declarations. my_sys.h should be used instead. libmysql/get_password.c: Change prototype to avoid casting when using C-strings (char *). mysql-test/mysql-test-run.pl: Added environment variables to be used from tests. mysql-test/r/im_daemon_life_cycle.result: Column name has been changed in SHOW INSTANCES. mysql-test/r/im_life_cycle.result: 1. Column name has been changed in SHOW INSTANCES. 2. Removed redundant SHOW INSTANCE STATUS statements. mysql-test/r/im_utils.result: Updated the result file. mysql-test/t/im_daemon_life_cycle-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_daemon_life_cycle.imtest: Get Instance Manager and managed mysqld-instances enough time to start. mysql-test/t/im_life_cycle.imtest: 1. Polishing; 2. Fixed a test error in 1.1.2. mysql-test/t/im_utils.imtest: Get Instance Manager and managed mysqld-instances enough time to start. mysys/default.c: Pass the name of the section to the handler function as well. mysys/default_modify.c: Added REMOVE_SECTION functionality. server-tools/instance-manager/IMService.cpp: Polishing: be more verbose. server-tools/instance-manager/IMService.h: Polishing: added copyright. server-tools/instance-manager/Makefile.am: Added new files. server-tools/instance-manager/WindowsService.cpp: Polishing: according to The Coding Style, TRUE/FALSE must be used instead of true/false. server-tools/instance-manager/WindowsService.h: Polishing: added copyright. server-tools/instance-manager/command.h: Polishing: provide a comment for the main operation of "Command" class. server-tools/instance-manager/commands.cc: 1. Added support for CREATE INSTANCE, DROP INSTANCE statements; 2. Added "deprecated" column in output of SHOW INSTANCE OPTIONS; 3. Modified the behaviour of SET/UNSET, FLUSH INSTANCES statements; server-tools/instance-manager/commands.h: 1. Added support for CREATE INSTANCE, DROP INSTANCE statements; 2. Added "deprecated" column in output of SHOW INSTANCE OPTIONS; 3. Modified the behaviour of SET/UNSET, FLUSH INSTANCES statements; server-tools/instance-manager/guardian.cc: Added operations to retrieve state of managed instances. server-tools/instance-manager/guardian.h: Added operations to retrieve state of managed instances. server-tools/instance-manager/instance.cc: 1. Provided an operation to check validity of instance name. 2. Added an attribute to distiguish mysqld-instances, whose configuration should be kept backward-compatible. server-tools/instance-manager/instance.h: 1. Provided an operation to check validity of instance name. 2. Added an attribute to distiguish mysqld-instances, whose configuration should be kept backward-compatible. server-tools/instance-manager/instance_map.cc: 1. Used the operation to check validity of instance name; 2. Added operations to manage instances. server-tools/instance-manager/instance_map.h: Added operations to manage instances. server-tools/instance-manager/instance_options.cc: Changed Instance_options so that it will be possible to manage options on the fly. server-tools/instance-manager/instance_options.h: Changed Instance_options so that it will be possible to manage options on the fly. server-tools/instance-manager/listener.cc: 1. Remove reference to the instance of Options; 2. Use new Options naming scheme. server-tools/instance-manager/listener.h: Remove reference to the instance of Options; server-tools/instance-manager/log.cc: Polishing: use TRUE/FALSE instead of true/false. server-tools/instance-manager/manager.cc: Added a common for IM operation to work with configuration file. server-tools/instance-manager/manager.h: Added a common for IM operation to work with configuration file. server-tools/instance-manager/messages.cc: Added messages for new errors. server-tools/instance-manager/mysql_connection.cc: 1. Move a constant to common place. 2. Polishing. server-tools/instance-manager/mysql_manager_error.h: Added new errors. server-tools/instance-manager/mysqlmanager.cc: 1. Use error code from Options::load(); 2. Eliminate type-casting warning on Windows. server-tools/instance-manager/options.cc: Added support for user-management command-line options. server-tools/instance-manager/options.h: Added support for user-management command-line options. server-tools/instance-manager/parse.cc: 1. Added support of new statements: - CREATE INSTANCE; - DROP INSTANCE. 2. Modified SET/UNSET. server-tools/instance-manager/parse.h: 1. Added support of new statements: - CREATE INSTANCE; - DROP INSTANCE. 2. Modified SET/UNSET. server-tools/instance-manager/parse_output.cc: Sorted out header files. server-tools/instance-manager/parse_output.h: Sorted out header files. server-tools/instance-manager/portability.h: 1. Added constants for Windows. 2. Moved system-dependent defines from instance_options.cc. server-tools/instance-manager/priv.cc: Updated version. server-tools/instance-manager/priv.h: Added some global constants. server-tools/instance-manager/protocol.cc: Replaced NAME_WITH_LENGTH by LEX_STRING. server-tools/instance-manager/protocol.h: Replaced NAME_WITH_LENGTH by LEX_STRING. server-tools/instance-manager/thread_registry.cc: Polishing: use TRUE/FALSE instead of true/false. server-tools/instance-manager/user_map.cc: Added support for managing password database. server-tools/instance-manager/user_map.h: Added support for managing password database. sql/sp.cc: Replaced LEX_STRING_WITH_INIT by LEX_STRING + struct initialization. sql/sp_head.cc: Replaced LEX_STRING_WITH_INIT by LEX_STRING + struct initialization. sql/spatial.cc: Removed LEX_STRING_WITH_INIT. sql/spatial.h: Removed LEX_STRING_WITH_INIT. sql/sql_string.h: Moved STRING_WITH_LEN() macro out from sql (to m_string.h). sql/sql_trigger.cc: Moved STRING_WITH_LEN() macro out from sql (to m_string.h). sql/structs.h: Removed LEX_STRING_WITH_INIT. support-files/mysql.server.sh: Instruct Instance Manager to work in mysqld-safe compatible mode for backward compatibility. mysql-test/r/im_cmd_line.result: Added result file. mysql-test/r/im_instance_conf.result: Added result file. mysql-test/r/im_options.result: Added result file. mysql-test/t/im_cmd_line.imtest: IM command-line options test. mysql-test/t/im_instance_conf-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_instance_conf.imtest: Added a new test case for checking instance-management. mysql-test/t/im_life_cycle-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_options.imtest: Join im_options_set and im_options_unset and add new tests. mysql-test/t/im_utils-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. server-tools/instance-manager/exit_codes.h: New file for defining exit codes for user-management mode. server-tools/instance-manager/user_management_commands.cc: User-management commands implementation. server-tools/instance-manager/user_management_commands.h: User-management command declarations.
322 lines
8 KiB
C++
322 lines
8 KiB
C++
/* Copyright (C) 2003 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include "manager.h"
|
|
|
|
#include <my_global.h>
|
|
#include <m_string.h>
|
|
#include <my_sys.h>
|
|
#include <thr_alarm.h>
|
|
|
|
#include <signal.h>
|
|
#ifndef __WIN__
|
|
#include <sys/wait.h>
|
|
#endif
|
|
|
|
#include "exit_codes.h"
|
|
#include "guardian.h"
|
|
#include "instance_map.h"
|
|
#include "listener.h"
|
|
#include "log.h"
|
|
#include "options.h"
|
|
#include "priv.h"
|
|
#include "thread_registry.h"
|
|
#include "user_map.h"
|
|
|
|
|
|
static int create_pid_file(const char *pid_file_name)
|
|
{
|
|
FILE *pid_file;
|
|
|
|
if (!(pid_file= my_fopen(pid_file_name, O_WRONLY | O_CREAT | O_BINARY,
|
|
MYF(0))))
|
|
{
|
|
log_error("Error: can not create pid file '%s': %s (errno: %d)",
|
|
(const char *) pid_file_name,
|
|
(const char *) strerror(errno),
|
|
(int) errno);
|
|
return 1;
|
|
}
|
|
|
|
if (fprintf(pid_file, "%d\n", (int) getpid()) <= 0)
|
|
{
|
|
log_error("Error: can not write to pid file '%s': %s (errno: %d)",
|
|
(const char *) pid_file_name,
|
|
(const char *) strerror(errno),
|
|
(int) errno);
|
|
return 1;
|
|
}
|
|
|
|
my_fclose(pid_file, MYF(0));
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifndef __WIN__
|
|
void set_signals(sigset_t *mask)
|
|
{
|
|
/* block signals */
|
|
sigemptyset(mask);
|
|
sigaddset(mask, SIGINT);
|
|
sigaddset(mask, SIGTERM);
|
|
sigaddset(mask, SIGPIPE);
|
|
sigaddset(mask, SIGHUP);
|
|
signal(SIGPIPE, SIG_IGN);
|
|
|
|
/*
|
|
We want this signal to be blocked in all theads but the signal
|
|
one. It is needed for the thr_alarm subsystem to work.
|
|
*/
|
|
sigaddset(mask,THR_SERVER_ALARM);
|
|
|
|
/* all new threads will inherite this signal mask */
|
|
pthread_sigmask(SIG_BLOCK, mask, NULL);
|
|
|
|
/*
|
|
In our case the signal thread also implements functions of alarm thread.
|
|
Here we init alarm thread functionality. We suppose that we won't have
|
|
more then 10 alarms at the same time.
|
|
*/
|
|
init_thr_alarm(10);
|
|
}
|
|
#else
|
|
|
|
bool have_signal;
|
|
|
|
void onsignal(int signo)
|
|
{
|
|
have_signal= TRUE;
|
|
}
|
|
|
|
void set_signals(sigset_t *set)
|
|
{
|
|
signal(SIGINT, onsignal);
|
|
signal(SIGTERM, onsignal);
|
|
have_signal= FALSE;
|
|
}
|
|
|
|
int my_sigwait(const sigset_t *set, int *sig)
|
|
{
|
|
while (!have_signal)
|
|
{
|
|
Sleep(100);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
/*
|
|
manager - entry point to the main instance manager process: start
|
|
listener thread, write pid file and enter into signal handling.
|
|
See also comments in mysqlmanager.cc to picture general Instance Manager
|
|
architecture.
|
|
|
|
TODO: how about returning error status.
|
|
*/
|
|
|
|
void manager()
|
|
{
|
|
int err_code;
|
|
const char *err_msg;
|
|
|
|
Thread_registry thread_registry;
|
|
/*
|
|
All objects created in the manager() function live as long as
|
|
thread_registry lives, and thread_registry is alive until there are
|
|
working threads.
|
|
*/
|
|
|
|
User_map user_map;
|
|
Instance_map instance_map(Options::Main::default_mysqld_path);
|
|
Guardian_thread guardian_thread(thread_registry,
|
|
&instance_map,
|
|
Options::Main::monitoring_interval);
|
|
|
|
Listener_thread_args listener_args(thread_registry, user_map, instance_map);
|
|
|
|
manager_pid= getpid();
|
|
instance_map.guardian= &guardian_thread;
|
|
|
|
/* Initialize instance map. */
|
|
|
|
if (instance_map.init())
|
|
{
|
|
log_error("Error: can not initialize instance list: out of memory.");
|
|
return;
|
|
}
|
|
|
|
/* Initialize user map and load password file. */
|
|
|
|
if (user_map.init())
|
|
{
|
|
log_error("Error: can not initialize user list: out of memory.");
|
|
return;
|
|
}
|
|
|
|
if ((err_code= user_map.load(Options::Main::password_file_name, &err_msg)))
|
|
{
|
|
if (err_code == ERR_PASSWORD_FILE_DOES_NOT_EXIST &&
|
|
Options::Main::mysqld_safe_compatible)
|
|
{
|
|
/*
|
|
The password file does not exist, but we are running in
|
|
mysqld_safe-compatible mode. Continue, but complain in log.
|
|
*/
|
|
|
|
log_error("Warning: password file does not exist, "
|
|
"nobody will be able to connect to Instance Manager.");
|
|
}
|
|
else
|
|
{
|
|
log_error("Error: %s.", (const char *) err_msg);
|
|
return;
|
|
}
|
|
}
|
|
|
|
/* write pid file */
|
|
if (create_pid_file(Options::Main::pid_file_name))
|
|
return; /* necessary logging has been already done. */
|
|
|
|
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 */
|
|
{
|
|
pthread_t guardian_thd_id;
|
|
pthread_attr_t guardian_thd_attr;
|
|
int rc;
|
|
|
|
/*
|
|
NOTE: Guardian should be shutdown first. Only then all other threads
|
|
need to be stopped. This should be done, as guardian is responsible for
|
|
shutting down the instances, and this is a long operation.
|
|
*/
|
|
|
|
pthread_attr_init(&guardian_thd_attr);
|
|
pthread_attr_setdetachstate(&guardian_thd_attr, PTHREAD_CREATE_DETACHED);
|
|
rc= set_stacksize_n_create_thread(&guardian_thd_id, &guardian_thd_attr,
|
|
guardian, &guardian_thread);
|
|
pthread_attr_destroy(&guardian_thd_attr);
|
|
if (rc)
|
|
{
|
|
log_error("manager(): set_stacksize_n_create_thread(guardian) failed");
|
|
goto err;
|
|
}
|
|
|
|
}
|
|
|
|
/*
|
|
To work nicely with LinuxThreads, the signal thread is the first thread
|
|
in the process.
|
|
*/
|
|
int signo;
|
|
bool shutdown_complete;
|
|
|
|
shutdown_complete= FALSE;
|
|
|
|
instance_map.guardian->lock();
|
|
instance_map.lock();
|
|
|
|
int flush_instances_status= instance_map.flush_instances();
|
|
|
|
instance_map.unlock();
|
|
instance_map.guardian->unlock();
|
|
|
|
if (flush_instances_status)
|
|
{
|
|
log_error("Cannot init instances repository. This might be caused by "
|
|
"the wrong config file options. For instance, missing mysqld "
|
|
"binary. Aborting.");
|
|
return;
|
|
}
|
|
|
|
/*
|
|
After the list of guarded instances have been initialized,
|
|
Guardian should start them.
|
|
*/
|
|
pthread_cond_signal(&guardian_thread.COND_guardian);
|
|
|
|
while (!shutdown_complete)
|
|
{
|
|
int status= 0;
|
|
|
|
if ((status= my_sigwait(&mask, &signo)) != 0)
|
|
{
|
|
log_error("sigwait() failed");
|
|
goto err;
|
|
}
|
|
|
|
#ifndef __WIN__
|
|
/*
|
|
On some Darwin kernels SIGHUP is delivered along with most
|
|
signals. This is why we skip it's processing on these
|
|
platforms. For more details and test program see
|
|
Bug #14164 IM tests fail on MacOS X (powermacg5)
|
|
*/
|
|
#ifdef IGNORE_SIGHUP_SIGQUIT
|
|
if ( SIGHUP == signo )
|
|
continue;
|
|
#endif
|
|
if (THR_SERVER_ALARM == signo)
|
|
process_alarm(signo);
|
|
else
|
|
#endif
|
|
{
|
|
if (!guardian_thread.is_stopped())
|
|
{
|
|
bool stop_instances= TRUE;
|
|
guardian_thread.request_shutdown(stop_instances);
|
|
pthread_cond_signal(&guardian_thread.COND_guardian);
|
|
}
|
|
else
|
|
{
|
|
thread_registry.deliver_shutdown();
|
|
shutdown_complete= TRUE;
|
|
}
|
|
}
|
|
}
|
|
|
|
err:
|
|
/* delete the pid file */
|
|
my_delete(Options::Main::pid_file_name, MYF(0));
|
|
|
|
#ifndef __WIN__
|
|
/* free alarm structures */
|
|
end_thr_alarm(1);
|
|
/* don't pthread_exit to kill all threads who did not shut down in time */
|
|
#endif
|
|
}
|