mirror of
https://github.com/MariaDB/server.git
synced 2025-12-13 20:03:16 +03:00
- 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.
248 lines
7.0 KiB
C++
248 lines
7.0 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 */
|
|
|
|
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
|
|
#pragma implementation
|
|
#endif
|
|
|
|
#include "thread_registry.h"
|
|
|
|
#include <my_global.h>
|
|
#include <thr_alarm.h>
|
|
|
|
#include <signal.h>
|
|
|
|
#include "log.h"
|
|
|
|
|
|
#ifndef __WIN__
|
|
/* Kick-off signal handler */
|
|
|
|
enum { THREAD_KICK_OFF_SIGNAL= SIGUSR2 };
|
|
|
|
static void handle_signal(int __attribute__((unused)) sig_no)
|
|
{
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
Thread_info initializer methods
|
|
*/
|
|
|
|
Thread_info::Thread_info() {}
|
|
Thread_info::Thread_info(pthread_t thread_id_arg) :
|
|
thread_id(thread_id_arg) {}
|
|
|
|
/*
|
|
TODO: think about moving signal information (now it's shutdown_in_progress)
|
|
to Thread_info. It will reduce contention and allow signal deliverence to
|
|
a particular thread, not to the whole worker crew
|
|
*/
|
|
|
|
Thread_registry::Thread_registry() :
|
|
shutdown_in_progress(FALSE)
|
|
,sigwait_thread_pid(pthread_self())
|
|
{
|
|
pthread_mutex_init(&LOCK_thread_registry, 0);
|
|
pthread_cond_init(&COND_thread_registry_is_empty, 0);
|
|
|
|
/* head is used by-value to simplify nodes inserting */
|
|
head.next= head.prev= &head;
|
|
}
|
|
|
|
|
|
Thread_registry::~Thread_registry()
|
|
{
|
|
/* Check that no one uses the repository. */
|
|
pthread_mutex_lock(&LOCK_thread_registry);
|
|
|
|
/* All threads must unregister */
|
|
DBUG_ASSERT(head.next == &head);
|
|
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
pthread_cond_destroy(&COND_thread_registry_is_empty);
|
|
pthread_mutex_destroy(&LOCK_thread_registry);
|
|
}
|
|
|
|
|
|
/*
|
|
Set signal handler for kick-off thread, and insert a thread info to the
|
|
repository. New node is appended to the end of the list; head.prev always
|
|
points to the last node.
|
|
*/
|
|
|
|
void Thread_registry::register_thread(Thread_info *info)
|
|
{
|
|
#ifndef __WIN__
|
|
struct sigaction sa;
|
|
sa.sa_handler= handle_signal;
|
|
sa.sa_flags= 0;
|
|
sigemptyset(&sa.sa_mask);
|
|
sigaction(THREAD_KICK_OFF_SIGNAL, &sa, 0);
|
|
#endif
|
|
info->current_cond= 0;
|
|
|
|
pthread_mutex_lock(&LOCK_thread_registry);
|
|
info->next= &head;
|
|
info->prev= head.prev;
|
|
head.prev->next= info;
|
|
head.prev= info;
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
}
|
|
|
|
|
|
/*
|
|
Unregister a thread from the repository and free Thread_info structure.
|
|
Every registered thread must unregister. Unregistering should be the last
|
|
thing a thread is doing, otherwise it could have no time to finalize.
|
|
*/
|
|
|
|
void Thread_registry::unregister_thread(Thread_info *info)
|
|
{
|
|
pthread_mutex_lock(&LOCK_thread_registry);
|
|
info->prev->next= info->next;
|
|
info->next->prev= info->prev;
|
|
if (head.next == &head)
|
|
pthread_cond_signal(&COND_thread_registry_is_empty);
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
}
|
|
|
|
|
|
/*
|
|
Check whether shutdown is in progress, and if yes, return immediately.
|
|
Else set info->current_cond and call pthread_cond_wait. When
|
|
pthread_cond_wait returns, unregister current cond and check the shutdown
|
|
status again.
|
|
RETURN VALUE
|
|
return value from pthread_cond_wait
|
|
*/
|
|
|
|
int Thread_registry::cond_wait(Thread_info *info, pthread_cond_t *cond,
|
|
pthread_mutex_t *mutex)
|
|
{
|
|
pthread_mutex_lock(&LOCK_thread_registry);
|
|
if (shutdown_in_progress)
|
|
{
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
return 0;
|
|
}
|
|
info->current_cond= cond;
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
/* sic: race condition here, cond can be signaled in deliver_shutdown */
|
|
int rc= pthread_cond_wait(cond, mutex);
|
|
pthread_mutex_lock(&LOCK_thread_registry);
|
|
info->current_cond= 0;
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
return rc;
|
|
}
|
|
|
|
|
|
int Thread_registry::cond_timedwait(Thread_info *info, pthread_cond_t *cond,
|
|
pthread_mutex_t *mutex,
|
|
struct timespec *wait_time)
|
|
{
|
|
int rc;
|
|
pthread_mutex_lock(&LOCK_thread_registry);
|
|
if (shutdown_in_progress)
|
|
{
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
return 0;
|
|
}
|
|
info->current_cond= cond;
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
/* sic: race condition here, cond can be signaled in deliver_shutdown */
|
|
if ((rc= pthread_cond_timedwait(cond, mutex, wait_time)) == ETIME)
|
|
rc= ETIMEDOUT; // For easier usage
|
|
pthread_mutex_lock(&LOCK_thread_registry);
|
|
info->current_cond= 0;
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
return rc;
|
|
}
|
|
|
|
|
|
/*
|
|
Deliver shutdown message to the workers crew.
|
|
As it's impossible to avoid all race conditions, signal latecomers
|
|
again.
|
|
*/
|
|
|
|
void Thread_registry::deliver_shutdown()
|
|
{
|
|
Thread_info *info;
|
|
struct timespec shutdown_time;
|
|
int error;
|
|
set_timespec(shutdown_time, 1);
|
|
|
|
pthread_mutex_lock(&LOCK_thread_registry);
|
|
shutdown_in_progress= TRUE;
|
|
|
|
#ifndef __WIN__
|
|
/* to stop reading from the network we need to flush alarm queue */
|
|
end_thr_alarm(0);
|
|
/*
|
|
We have to deliver final alarms this way, as the main thread has already
|
|
stopped alarm processing.
|
|
*/
|
|
process_alarm(THR_SERVER_ALARM);
|
|
#endif
|
|
|
|
for (info= head.next; info != &head; info= info->next)
|
|
{
|
|
pthread_kill(info->thread_id, THREAD_KICK_OFF_SIGNAL);
|
|
/*
|
|
sic: race condition here, the thread may not yet fall into
|
|
pthread_cond_wait.
|
|
*/
|
|
if (info->current_cond)
|
|
pthread_cond_signal(info->current_cond);
|
|
}
|
|
/*
|
|
The common practice is to test predicate before pthread_cond_wait.
|
|
I don't do that here because the predicate is practically always false
|
|
before wait - is_shutdown's been just set, and the lock's still not
|
|
released - the only case when the predicate is false is when no other
|
|
threads exist.
|
|
*/
|
|
while (((error= pthread_cond_timedwait(&COND_thread_registry_is_empty,
|
|
&LOCK_thread_registry,
|
|
&shutdown_time)) != ETIMEDOUT &&
|
|
error != ETIME) &&
|
|
head.next != &head)
|
|
;
|
|
|
|
/*
|
|
If previous signals did not reach some threads, they must be sleeping
|
|
in pthread_cond_wait or in a blocking syscall. Wake them up:
|
|
every thread shall check signal variables after each syscall/cond_wait,
|
|
so this time everybody should be informed (presumably each worker can
|
|
get CPU during shutdown_time.)
|
|
*/
|
|
for (info= head.next; info != &head; info= info->next)
|
|
{
|
|
pthread_kill(info->thread_id, THREAD_KICK_OFF_SIGNAL);
|
|
if (info->current_cond)
|
|
pthread_cond_signal(info->current_cond);
|
|
}
|
|
|
|
pthread_mutex_unlock(&LOCK_thread_registry);
|
|
}
|
|
|
|
|
|
void Thread_registry::request_shutdown()
|
|
{
|
|
pthread_kill(sigwait_thread_pid, SIGTERM);
|
|
}
|