mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54:20 +01:00
9e6784924a
Fixed compile-pentium64 scripts Fixed wrong estimate of update_with_key_prefix in sql-bench Merge bk-internal.mysql.com:/home/bk/mysql-5.1 into mysql.com:/home/my/mysql-5.1 Fixed unsafe define of uint4korr() Fixed that --extern works with mysql-test-run.pl Small trivial cleanups This also fixes a bug in counting number of rows that are updated when we have many simultanous queries Move all connection handling and command exectuion main loop from sql_parse.cc to sql_connection.cc Split handle_one_connection() into reusable sub functions. Split create_new_thread() into reusable sub functions. Added thread_scheduler; Preliminary interface code for future thread_handling code. Use 'my_thread_id' for internal thread id's Make thr_alarm_kill() to depend on thread_id instead of thread Make thr_abort_locks_for_thread() depend on thread_id instead of thread In store_globals(), set my_thread_var->id to be thd->thread_id. Use my_thread_var->id as basis for my_thread_name() The above changes makes the connection we have between THD and threads more soft. Added a lot of DBUG_PRINT() and DBUG_ASSERT() functions Fixed compiler warnings Fixed core dumps when running with --debug Removed setting of signal masks (was never used) Made event code call pthread_exit() (portability fix) Fixed that event code doesn't call DBUG_xxx functions before my_thread_init() is called. Made handling of thread_id and thd->variables.pseudo_thread_id uniform. Removed one common 'not freed memory' warning from mysqltest Fixed a couple of usage of not initialized warnings (unlikely cases) Suppress compiler warnings from bdb and (for the moment) warnings from ndb BitKeeper/deleted/.del-SETUP.sh.rej: Rename: BUILD/SETUP.sh.rej -> BitKeeper/deleted/.del-SETUP.sh.rej BitKeeper/deleted/.del-configure.in.rej: Rename: configure.in.rej -> BitKeeper/deleted/.del-configure.in.rej BitKeeper/deleted/.del-my_global.h.rej: Rename: include/my_global.h.rej -> BitKeeper/deleted/.del-my_global.h.rej BitKeeper/deleted/.del-my_pthread.h.rej: Rename: include/my_pthread.h.rej -> BitKeeper/deleted/.del-my_pthread.h.rej BitKeeper/deleted/.del-mysql_client_test.c.rej: Rename: tests/mysql_client_test.c.rej -> BitKeeper/deleted/.del-mysql_client_test.c.rej BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89: Rename: sql/mysqld.cc.rej -> BitKeeper/deleted/.del-mysqld.cc.rej~35c1c438e11ebd89 BitKeeper/deleted/.del-sql_parse.cc.rej: Rename: sql/sql_parse.cc.rej -> BitKeeper/deleted/.del-sql_parse.cc.rej BitKeeper/deleted/.del-table.cc.rej: Rename: sql/table.cc.rej -> BitKeeper/deleted/.del-table.cc.rej BitKeeper/deleted/.del-thr_alarm.c.rej: Rename: mysys/thr_alarm.c.rej -> BitKeeper/deleted/.del-thr_alarm.c.rej BUILD/compile-pentium64: Update this to be in line with compile-pentium BUILD/compile-pentium: Send command line options to SETUP.sh BUILD/compile-solaris-sparc-debug: Update scripts BUILD/compile-solaris-sparc-forte: Update scripts BUILD/compile-solaris-sparc-purify: Update scripts BUILD/compile-solaris-sparc: Update scripts BitKeeper/deleted/.del-DbtupSystemRestart.cpp~15b54d7e4e75d2d: Removed compiler warning BitKeeper/deleted/.del-ha_berkeley.cc: Moved get_auto_primary_key() here as int5store() gives (wrong) compiler warnings in win64 configure.in: Added detection of port_create and port.h (for future)as --- manual merge BitKeeper/deleted/.del-ha_berkeley.h: Moved get_auto_primary_key() to ha_berkeley.cc BitKeeper/deleted/.del-mysqlmanager.c~e97636d71145a0b: Fixed compiler warnings BitKeeper/etc/ignore: added storage/ndb/src/ndbapi/ndberror_check client/mysqlbinlog.cc: Removed not needed 'static' (caused compiler warning) client/mysqldump.c: Fixed compiler warnings from 'max' build client/mysqltest.c: Free warning and query memory no abort. (Removes strange warnings on screen if mysql-test-run fails) Removed compiler warnings Portability fix for windows (windows doesn't have mode_t) client/sql_string.h: Removed compiler warning cmd-line-utils/readline/xmalloc.c: Fixed compiler warnings from 'max' build extra/charset2html.c: Fixed compiler warnings extra/comp_err.c: Fixed compiler warnings from 'max' build extra/yassl/include/lock.hpp: Fix for windows64 extra/yassl/include/openssl/ssl.h: Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit extra/yassl/include/socket_wrapper.hpp: Moved socket_t to ssl.h, to be able to removed compiler warnings on windows 64 bit extra/yassl/include/yassl.hpp: Fix for windows64 extra/yassl/src/ssl.cpp: Removed compiler warning Detect wrong parameter (Happens when running test suite on solaris) Changed prototype for SSL_set_fd() to fix compiler warnings (and possible errors) on windows 64 bit extra/yassl/taocrypt/src/integer.cpp: Fixed compiler warnings extra/yassl/testsuite/testsuite.cpp: Removed compiler warning include/config-win.h: Added HAVE_WINSOCK2 (for future) include/my_dbug.h: Fixed DBUG_PROCESS() so that we don't get compiler warnings for it include/my_global.h: Fixed unsafe define of uint4korr() manual merge (ignore changes from 5.0) Fixed warnings on win64 when using int5store and int6store include/my_pthread.h: Added my_thread_id typedef Renamed 'my_thread_id() function to my_thead_dbug_id() include/thr_alarm.h: Make thr_alarm_kill() to depend on thread_id instead of thread include/thr_lock.h: Make thr_abort_locks_for_thread() depend on thread_id instead of thread libmysql/libmysql.def: Fixed compiler warnings on win64 libmysqld/CMakeLists.txt: Added missing files libmysqld/Makefile.am: Added new files libmysqld/lib_sql.cc: Remove not needed code (store_globals() now takes care of things) mysql-test/lib/mtr_report.pl: Removed wrong messages when using --extern mysql-test/mysql-test-run.pl: Fixed that --extern works Print help on stdout instead of stderr (make it easier to pipe it to less) Fixed typo that caused mysql-test-run.pl to fail on Solaris mysql-test/r/keywords.result: manual merge mysql-test/r/ndb_lock.result: After merge fixes mysql-test/r/ps.result: Portability fix mysql-test/t/disabled.def: Disabled ndb_alter_table as this very often fails for me (and have done it for a long time) mysql-test/t/keywords.test: manual merge mysql-test/t/ndb_lock.test: Added other possible error code mysql-test/t/ps.test: Portability fix (when compiling without DLOPEN) mysql-test/t/wait_timeout.test: Don't run this if we are not using a thread per connection (as other thread_handling code may not support timeouts) mysys/base64.c: Fixed compiler warnings on win64 mysys/mf_keycache.c: Fixed compiler warnings mysys/my_getopt.c: Fixed compiler warning mysys/my_init.c: Fixed compiler warning Re-indented long comment mysys/my_thr_init.c: Always use mysys_var->id to generate thread name (makes things uniform accross thread implementations and thread usage) Always generate my_thread_name() when using DBUG Ensure mysys_var->pthread_self is set Fixed compiler warnings mysys/ptr_cmp.c: Fixed compiler warnings from 'max' build mysys/thr_alarm.c: Change thr_alarm_kill() to use mysys_var->id instead of thread id Fixed compiler warning on windows mysys/thr_lock.c: Change thr_abort_locks_for_thread() to use mysys_var->id instead of thread id Add purecov statements around not tested code Fixed compiler warnings mysys/thr_mutex.c: my_thread_id() -> my_thread_dbug_id() server-tools/instance-manager/guardian.cc: Fixed compiler warning server-tools/instance-manager/instance.cc: Fixed compiler warning server-tools/instance-manager/mysql_connection.cc: Fixed compiler warnings server-tools/instance-manager/mysqlmanager.cc: Fixed compiler warnings sql/CMakeLists.txt: Added missing files sql/Makefile.am: Added new files sql/event_scheduler.cc: Added pthread_exit() calls Ensure DBUG_xxx calls are not made before my_thread_init() Use common functions to set up thread handling sql/field.h: manual merge sql/ha_ndbcluster.cc: Removed some trivial 'current_thd' calls sql/handler.cc: Avoid warnings on KILL_CONNECTION Don't print out null pointer with printf() (Causes crashes on Solaris) sql/item.cc: Fixed compiler warnings from 'max' build sql/item_cmpfunc.cc: After merge fixes sql/item_func.cc: Merge embedded and normal code usage (GET_LOCK, RELEASE_LOCK now works on my_thread_id instead of pthread_t) Fixed compiler warning sql/item_strfunc.cc: Fixed compiler warning sql/item_timefunc.cc: Fixed compiler warnings sql/lock.cc: Use (new) parameter to thr_abort_locks_for_thread() sql/log.cc: Fixed compiler warning sql/log_event.cc: Fixed compiler warnings about not used variable sql/mysql_priv.h: Remove TEST_NO_THREADS (not needed with new scheduler interface) Added functions from sql_connect.cc and new functions from sql_parse.cc sql/mysqld.cc: Use thread_scheduler structure to dispatch calls (make code more dynamic) Change --one-thread option to use thread_scheduler interface Made ONE_THREAD option independent of DBUG_BUILD --one-thread is now depricated. One should instead use '--thread-handling=no-threads' Remove not used uname() function. Split create_new_thread() into reusable sub functions. Preliminary interface code for future thread_handling code. Fixed compiler warnings sql/parse_file.cc: Don't send zero pointer to fn_format() (Causes crashes when using --debug) sql/repl_failsafe.cc: Setup pseudo_thread_id same way as other code sql/set_var.cc: Added variables 'thread_handling' Prepare for future variable 'thread_pool_size' Fixed compiler warnings sql/set_var.h: Fixed compiler warning sql/slave.cc: Setup pseudo_thread_id same way as other code Removed not used signal mask sql/sql_acl.cc: Fixed compiler warnings from 'max' build sql/sql_base.cc: Fixed long comments Normalized variable setup Don't destroy value of thd->variables.pseduo_thread_id More DBUG_PRINT()'s More DBUG_ASSERT()'s Fixed compiler warnings from 'max' build sql/sql_class.cc: Remove thd->real_id and thd->dbug_thread_id Added DBUG_ASSERT() Use thread_scheduler to signal threads to be killed. In THD::store_globals(), set my_thread_var->id to be thd->thread_id. Fixed compiler warnings sql/sql_class.h: Use 'my_thread_id' for internal thread id's Remove not needed THD elements: block_signals and dbug_thread_id Added 'thread_scheduler' scheduling extension element to THD sql/sql_insert.cc: After merge fixes (This actually fixes a bug in old code when many connections are in use) Setup pseudo_thread_id same way as other code Removed not used signal mask Initialize variable that may be used unitialized on error conditions (not fatal) sql/sql_parse.cc: Move connection related code to sql_connect.cc Remove setting of signal mask (not needed) Ensure TABLE_LIST->alias is set for generated TABLE_LIST elements (fixed core dumps when running with --debug) Added previous 'optional' element to reset_mgh() Removed not needed DBUG_PRINT call sql/sql_partition.cc: Fixed compiler warnings sql/sql_prepare.cc: Removed not needed casts Fixed compiler warnings from 'max' build sql/sql_select.cc: Fixed compiler warnings sql-bench/bench-init.pl.sh: Added --one-missing-tests sql-bench/example: Better example sql-bench/run-all-tests.sh: Added --only-missing-tests sql-bench/test-insert.sh: Fixed wrong estimate of update_with_key_prefix sql/sql_show.cc: Don't send pthread_kill() to threads to detect if they exists. (Not that useful and causes problems with future thread_handling code) Fixed compiler warnings sql/sql_table.cc: Simplify code Fixed compiler warnings sql/sql_test.cc: Remove dbug_thread_id from test output sql/sql_view.cc: Don't send zero pointer to fn_format() sql/tztime.cc: Fixed compiler warning sql/udf_example.def: Fixed compiler warnings on win64 sql/unireg.cc: Initialize variable that may be used unitialized on error conditions storage/archive/archive_test.c: Fixed compiler warnings storage/archive/azio.c: Fixed compiler warnings storage/innobase/dict/dict0crea.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0dict.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0load.c: Fixed compiler warnings detected on windows64 storage/innobase/dict/dict0mem.c: Fixed compiler warnings detected on windows64 storage/innobase/eval/eval0proc.c: Fixed compiler warnings detected on windows64 storage/innobase/handler/ha_innodb.cc: Fixed compiler warnings detected on windows64 storage/innobase/include/ut0byte.ic: Fixed compiler warnings on win64 storage/innobase/include/ut0ut.ic: Fixed compiler warnings on win64 storage/innobase/mtr/mtr0log.c: Fixed compiler warnings detected on windows64 storage/innobase/pars/pars0lex.l: Fixed warnings on win64 storage/innobase/rem/rem0cmp.c: Fixed compiler warnings detected on windows64 storage/innobase/row/row0mysql.c: Fixed compiler warnings detected on windows64 storage/innobase/row/row0sel.c: Fixed compiler warnings detected on windows64 storage/innobase/sync/sync0rw.c: Fixed compiler warnings detected on windows64 storage/innobase/trx/trx0trx.c: Fixed compiler warnings detected on windows64 storage/myisam/mi_log.c: my_thread_id() -> my_thread_debug_id() storage/myisam/mi_packrec.c: Fixed compiler warnings detected on windows64 storage/myisam/myisamchk.c: Fixed compiler warnings from 'max' build storage/ndb/src/common/debugger/EventLogger.cpp: Fixed compiler warnings storage/ndb/src/common/util/ConfigValues.cpp: Removed compiler warnings storage/ndb/src/common/util/NdbSqlUtil.cpp: Removed compiler warnings storage/ndb/src/cw/cpcd/CPCD.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Fixed compiler warnings detected on windows64 storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp: Fixed compiler warnings storage/ndb/src/kernel/blocks/diskpage.hpp: Fixed compiler warnings storage/ndb/src/kernel/vm/ndbd_malloc.cpp: Fixed compiler warnings storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp: Fixed compiler warnings storage/ndb/src/mgmclient/main.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/NdbOperationExec.cpp: Fixed compiler warnings storage/ndb/src/ndbapi/SignalSender.cpp: Fixed compiler warnings storage/ndb/tools/restore/consumer_restore.cpp: Fixed compiler warnings strings/ctype-ucs2.c: Fixed compiler warnings strings/ctype-utf8.c: Fixed compiler warnings strings/decimal.c: Fixed compiler warnings strings/my_strchr.c: Fixed conflict between function and prototype support-files/compiler_warnings.supp: Ignore warnings from sql_yacc.cc that are hard to remove Ignore some not important warnings from windows 64 bit build Suppress warnings from bdb and (for the moment) warnings from ndb Suppress all warnings for all pushbuild platforms (should make all trees green) vio/viosslfactories.c: Added DBUG_PRINT BUILD/compile-pentium64-max: New BitKeeper file ``BUILD/compile-pentium64-max'' libmysqld/scheduler.cc: New BitKeeper file ``libmysqld/scheduler.cc'' libmysqld/sql_connect.cc: New BitKeeper file ``libmysqld/sql_connect.cc'' mysql-test/include/one_thread_per_connection.inc: New BitKeeper file ``mysql-test/include/one_thread_per_connection.inc'' mysql-test/r/no-threads.result: New BitKeeper file ``mysql-test/r/no-threads.result'' mysql-test/r/one_thread_per_connection.require: New BitKeeper file ``mysql-test/r/one_thread_per_connection.require'' mysql-test/t/no-threads-master.opt: New BitKeeper file ``mysql-test/t/no-threads-master.opt'' mysql-test/t/no-threads.test: New BitKeeper file ``mysql-test/t/no-threads.test'' sql/scheduler.cc: New BitKeeper file ``sql/scheduler.cc'' sql/scheduler.h: New BitKeeper file ``sql/scheduler.h'' sql/sql_connect.cc: New BitKeeper file ``sql/sql_connect.cc''
950 lines
23 KiB
C++
950 lines
23 KiB
C++
/* Copyright (C) 2004 MySQL 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; version 2 of the License.
|
|
|
|
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 <my_global.h>
|
|
#include <mysql.h>
|
|
|
|
#include <signal.h>
|
|
#ifndef __WIN__
|
|
#include <sys/wait.h>
|
|
#endif
|
|
|
|
#include "manager.h"
|
|
#include "guardian.h"
|
|
#include "instance.h"
|
|
#include "log.h"
|
|
#include "mysql_manager_error.h"
|
|
#include "portability.h"
|
|
#include "priv.h"
|
|
#include "thread_registry.h"
|
|
#include "instance_map.h"
|
|
|
|
|
|
/*************************************************************************
|
|
{{{ Platform-specific functions.
|
|
*************************************************************************/
|
|
|
|
#ifndef __WIN__
|
|
typedef pid_t My_process_info;
|
|
#else
|
|
typedef PROCESS_INFORMATION My_process_info;
|
|
#endif
|
|
|
|
/*
|
|
Wait for an instance
|
|
|
|
SYNOPSIS
|
|
wait_process()
|
|
pi Pointer to the process information structure
|
|
(platform-dependent).
|
|
|
|
RETURN
|
|
0 - Success
|
|
1 - Error
|
|
*/
|
|
|
|
#ifndef __WIN__
|
|
static int wait_process(My_process_info *pi)
|
|
{
|
|
/*
|
|
Here we wait for the child created. This process differs for systems
|
|
running LinuxThreads and POSIX Threads compliant systems. This is because
|
|
according to POSIX we could wait() for a child in any thread of the
|
|
process. While LinuxThreads require that wait() is called by the thread,
|
|
which created the child.
|
|
On the other hand we could not expect mysqld to return the pid, we
|
|
got in from fork(), to wait4() fucntion when running on LinuxThreads.
|
|
This is because MySQL shutdown thread is not the one, which was created
|
|
by our fork() call.
|
|
So basically we have two options: whether the wait() call returns only in
|
|
the creator thread, but we cannot use waitpid() since we have no idea
|
|
which pid we should wait for (in fact it should be the pid of shutdown
|
|
thread, but we don't know this one). Or we could use waitpid(), but
|
|
couldn't use wait(), because it could return in any wait() in the program.
|
|
*/
|
|
|
|
if (Manager::is_linux_threads())
|
|
wait(NULL); /* LinuxThreads were detected */
|
|
else
|
|
waitpid(*pi, NULL, 0);
|
|
|
|
return 0;
|
|
}
|
|
#else
|
|
static int wait_process(My_process_info *pi)
|
|
{
|
|
/* Wait until child process exits. */
|
|
WaitForSingleObject(pi->hProcess, INFINITE);
|
|
|
|
DWORD exitcode;
|
|
::GetExitCodeProcess(pi->hProcess, &exitcode);
|
|
|
|
/* Close process and thread handles. */
|
|
CloseHandle(pi->hProcess);
|
|
CloseHandle(pi->hThread);
|
|
|
|
/*
|
|
GetExitCodeProces returns zero on failure. We should revert this value
|
|
to report an error.
|
|
*/
|
|
return (!exitcode);
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
Launch an instance
|
|
|
|
SYNOPSIS
|
|
start_process()
|
|
instance_options Pointer to the options of the instance to be
|
|
launched.
|
|
pi Pointer to the process information structure
|
|
(platform-dependent).
|
|
|
|
RETURN
|
|
FALSE - Success
|
|
TRUE - Cannot create an instance
|
|
*/
|
|
|
|
#ifndef __WIN__
|
|
static bool start_process(Instance_options *instance_options,
|
|
My_process_info *pi)
|
|
{
|
|
#ifndef __QNX__
|
|
*pi= fork();
|
|
#else
|
|
/*
|
|
On QNX one cannot use fork() in multithreaded environment and we
|
|
should use spawn() or one of it's siblings instead.
|
|
Here we use spawnv(), which is a combination of fork() and execv()
|
|
in one call. It returns the pid of newly created process (>0) or -1
|
|
*/
|
|
*pi= spawnv(P_NOWAIT, instance_options->mysqld_path, instance_options->argv);
|
|
#endif
|
|
|
|
switch (*pi) {
|
|
case 0: /* never happens on QNX */
|
|
execv(instance_options->mysqld_path.str, instance_options->argv);
|
|
/* exec never returns */
|
|
exit(1);
|
|
case -1:
|
|
log_error("Instance '%s': can not start mysqld: fork() failed.",
|
|
(const char *) instance_options->instance_name.str);
|
|
return TRUE;
|
|
}
|
|
|
|
return FALSE;
|
|
}
|
|
#else
|
|
static bool start_process(Instance_options *instance_options,
|
|
My_process_info *pi)
|
|
{
|
|
STARTUPINFO si;
|
|
|
|
ZeroMemory(&si, sizeof(STARTUPINFO));
|
|
si.cb= sizeof(STARTUPINFO);
|
|
ZeroMemory(pi, sizeof(PROCESS_INFORMATION));
|
|
|
|
int cmdlen= 0;
|
|
for (int i= 0; instance_options->argv[i] != 0; i++)
|
|
cmdlen+= strlen(instance_options->argv[i]) + 3;
|
|
cmdlen++; /* make room for the null */
|
|
|
|
char *cmdline= new char[cmdlen];
|
|
if (cmdline == NULL)
|
|
return TRUE;
|
|
|
|
cmdline[0]= 0;
|
|
for (int i= 0; instance_options->argv[i] != 0; i++)
|
|
{
|
|
strcat(cmdline, "\"");
|
|
strcat(cmdline, instance_options->argv[i]);
|
|
strcat(cmdline, "\" ");
|
|
}
|
|
|
|
/* Start the child process */
|
|
BOOL result=
|
|
CreateProcess(NULL, /* Put it all in cmdline */
|
|
cmdline, /* Command line */
|
|
NULL, /* Process handle not inheritable */
|
|
NULL, /* Thread handle not inheritable */
|
|
FALSE, /* Set handle inheritance to FALSE */
|
|
0, /* No creation flags */
|
|
NULL, /* Use parent's environment block */
|
|
NULL, /* Use parent's starting directory */
|
|
&si, /* Pointer to STARTUPINFO structure */
|
|
pi); /* Pointer to PROCESS_INFORMATION structure */
|
|
delete cmdline;
|
|
|
|
return !result;
|
|
}
|
|
#endif
|
|
|
|
#ifdef __WIN__
|
|
|
|
BOOL SafeTerminateProcess(HANDLE hProcess, UINT uExitCode)
|
|
{
|
|
DWORD dwTID, dwCode, dwErr= 0;
|
|
HANDLE hProcessDup= INVALID_HANDLE_VALUE;
|
|
HANDLE hRT= NULL;
|
|
HINSTANCE hKernel= GetModuleHandle("Kernel32");
|
|
BOOL bSuccess= FALSE;
|
|
|
|
BOOL bDup= DuplicateHandle(GetCurrentProcess(),
|
|
hProcess, GetCurrentProcess(), &hProcessDup,
|
|
PROCESS_ALL_ACCESS, FALSE, 0);
|
|
|
|
// Detect the special case where the process is
|
|
// already dead...
|
|
if (GetExitCodeProcess((bDup) ? hProcessDup : hProcess, &dwCode) &&
|
|
(dwCode == STILL_ACTIVE))
|
|
{
|
|
FARPROC pfnExitProc;
|
|
|
|
pfnExitProc= GetProcAddress(hKernel, "ExitProcess");
|
|
|
|
hRT= CreateRemoteThread((bDup) ? hProcessDup : hProcess, NULL, 0,
|
|
(LPTHREAD_START_ROUTINE)pfnExitProc,
|
|
(PVOID)uExitCode, 0, &dwTID);
|
|
|
|
if (hRT == NULL)
|
|
dwErr= GetLastError();
|
|
}
|
|
else
|
|
dwErr= ERROR_PROCESS_ABORTED;
|
|
|
|
if (hRT)
|
|
{
|
|
// Must wait process to terminate to
|
|
// guarantee that it has exited...
|
|
WaitForSingleObject((bDup) ? hProcessDup : hProcess, INFINITE);
|
|
|
|
CloseHandle(hRT);
|
|
bSuccess= TRUE;
|
|
}
|
|
|
|
if (bDup)
|
|
CloseHandle(hProcessDup);
|
|
|
|
if (!bSuccess)
|
|
SetLastError(dwErr);
|
|
|
|
return bSuccess;
|
|
}
|
|
|
|
int kill(pid_t pid, int signum)
|
|
{
|
|
HANDLE processhandle= ::OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid);
|
|
if (signum == SIGTERM)
|
|
::SafeTerminateProcess(processhandle, 0);
|
|
else
|
|
::TerminateProcess(processhandle, -1);
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
/*************************************************************************
|
|
}}}
|
|
*************************************************************************/
|
|
|
|
|
|
/*************************************************************************
|
|
{{{ Static constants.
|
|
*************************************************************************/
|
|
|
|
const LEX_STRING
|
|
Instance::DFLT_INSTANCE_NAME= { C_STRING_WITH_LEN("mysqld") };
|
|
|
|
/*************************************************************************
|
|
}}}
|
|
*************************************************************************/
|
|
|
|
|
|
/*************************************************************************
|
|
{{{ Instance Monitor thread.
|
|
*************************************************************************/
|
|
|
|
/**
|
|
Proxy thread is a simple way to avoid all pitfalls of the threads
|
|
implementation in the OS (e.g. LinuxThreads). With such a thread we
|
|
don't have to process SIGCHLD, which is a tricky business if we want
|
|
to do it in a portable way.
|
|
|
|
Instance Monitor Thread forks a child process, execs mysqld and waits for
|
|
the child to die.
|
|
|
|
Instance Monitor assumes that the monitoring instance will not be dropped.
|
|
This is guaranteed by having flag monitoring_thread_active and
|
|
Instance::is_active() operation.
|
|
*/
|
|
|
|
class Instance_monitor: public Thread
|
|
{
|
|
public:
|
|
Instance_monitor(Instance *instance_arg) :instance(instance_arg) {}
|
|
protected:
|
|
virtual void run();
|
|
void start_and_monitor_instance();
|
|
private:
|
|
Instance *instance;
|
|
};
|
|
|
|
|
|
void Instance_monitor::run()
|
|
{
|
|
start_and_monitor_instance();
|
|
delete this;
|
|
}
|
|
|
|
|
|
void Instance_monitor::start_and_monitor_instance()
|
|
{
|
|
Thread_registry *thread_registry= Manager::get_thread_registry();
|
|
Guardian *guardian= Manager::get_guardian();
|
|
|
|
My_process_info mysqld_process_info;
|
|
Thread_info monitor_thread_info;
|
|
|
|
log_info("Instance '%s': Monitor: started.",
|
|
(const char *) instance->get_name()->str);
|
|
|
|
/*
|
|
For guarded instance register the thread in Thread_registry to wait for
|
|
the thread to stop on shutdown (nonguarded instances are not stopped on
|
|
shutdown, so the thread will no finish).
|
|
*/
|
|
|
|
if (instance->is_guarded())
|
|
{
|
|
thread_registry->register_thread(&monitor_thread_info, FALSE);
|
|
}
|
|
|
|
/* Starting mysqld. */
|
|
|
|
log_info("Instance '%s': Monitor: starting mysqld...",
|
|
(const char *) instance->get_name()->str);
|
|
|
|
if (start_process(&instance->options, &mysqld_process_info))
|
|
{
|
|
instance->lock();
|
|
instance->monitoring_thread_active= FALSE;
|
|
instance->unlock();
|
|
|
|
return;
|
|
}
|
|
|
|
/* Waiting for mysqld to die. */
|
|
|
|
log_info("Instance '%s': Monitor: waiting for mysqld to stop...",
|
|
(const char *) instance->get_name()->str);
|
|
|
|
wait_process(&mysqld_process_info); /* Don't check for return value. */
|
|
|
|
log_info("Instance '%s': Monitor: mysqld stopped.",
|
|
(const char *) instance->get_name()->str);
|
|
|
|
/* Update instance status. */
|
|
|
|
instance->lock();
|
|
|
|
if (instance->is_guarded())
|
|
thread_registry->unregister_thread(&monitor_thread_info);
|
|
|
|
instance->crashed= TRUE;
|
|
instance->monitoring_thread_active= FALSE;
|
|
|
|
log_info("Instance '%s': Monitor: finished.",
|
|
(const char *) instance->get_name()->str);
|
|
|
|
instance->unlock();
|
|
|
|
/* Wake up guardian. */
|
|
|
|
guardian->ping();
|
|
}
|
|
|
|
/**************************************************************************
|
|
}}}
|
|
**************************************************************************/
|
|
|
|
|
|
/**************************************************************************
|
|
{{{ Static operations.
|
|
**************************************************************************/
|
|
|
|
/**
|
|
The operation is intended to check whether string is a well-formed
|
|
instance name or not.
|
|
|
|
SYNOPSIS
|
|
is_name_valid()
|
|
name string to check
|
|
|
|
RETURN
|
|
TRUE string is a valid instance name
|
|
FALSE string is not a valid instance name
|
|
|
|
TODO: Move to Instance_name class: Instance_name::is_valid().
|
|
*/
|
|
|
|
bool Instance::is_name_valid(const LEX_STRING *name)
|
|
{
|
|
const char *name_suffix= name->str + DFLT_INSTANCE_NAME.length;
|
|
|
|
if (strncmp(name->str, Instance::DFLT_INSTANCE_NAME.str,
|
|
Instance::DFLT_INSTANCE_NAME.length) != 0)
|
|
return FALSE;
|
|
|
|
return *name_suffix == 0 || my_isdigit(default_charset_info, *name_suffix);
|
|
}
|
|
|
|
|
|
/**
|
|
The operation is intended to check if the given instance name is
|
|
mysqld-compatible or not.
|
|
|
|
SYNOPSIS
|
|
is_mysqld_compatible_name()
|
|
name name to check
|
|
|
|
RETURN
|
|
TRUE name is mysqld-compatible
|
|
FALSE otherwise
|
|
|
|
TODO: Move to Instance_name class: Instance_name::is_mysqld_compatible().
|
|
*/
|
|
|
|
bool Instance::is_mysqld_compatible_name(const LEX_STRING *name)
|
|
{
|
|
return strcmp(name->str, DFLT_INSTANCE_NAME.str) == 0;
|
|
}
|
|
|
|
|
|
/**
|
|
Return client state name. Must not be used outside the class.
|
|
Use Instance::get_state_name() instead.
|
|
*/
|
|
|
|
const char * Instance::get_instance_state_name(enum_instance_state state)
|
|
{
|
|
switch (state) {
|
|
case STOPPED:
|
|
return "offline";
|
|
|
|
case NOT_STARTED:
|
|
return "not started";
|
|
|
|
case STARTING:
|
|
return "starting";
|
|
|
|
case STARTED:
|
|
return "online";
|
|
|
|
case JUST_CRASHED:
|
|
return "failed";
|
|
|
|
case CRASHED:
|
|
return "crashed";
|
|
|
|
case CRASHED_AND_ABANDONED:
|
|
return "abandoned";
|
|
|
|
case STOPPING:
|
|
return "stopping";
|
|
}
|
|
|
|
return NULL; /* just to ignore compiler warning. */
|
|
}
|
|
|
|
/**************************************************************************
|
|
}}}
|
|
**************************************************************************/
|
|
|
|
|
|
/**************************************************************************
|
|
{{{ Initialization & deinitialization.
|
|
**************************************************************************/
|
|
|
|
Instance::Instance()
|
|
:monitoring_thread_active(FALSE),
|
|
crashed(FALSE),
|
|
configured(FALSE),
|
|
/* mysqld_compatible is initialized in init() */
|
|
state(NOT_STARTED),
|
|
restart_counter(0),
|
|
crash_moment(0),
|
|
last_checked(0)
|
|
{
|
|
pthread_mutex_init(&LOCK_instance, 0);
|
|
}
|
|
|
|
|
|
Instance::~Instance()
|
|
{
|
|
log_info("Instance '%s': destroying...", (const char *) get_name()->str);
|
|
|
|
pthread_mutex_destroy(&LOCK_instance);
|
|
}
|
|
|
|
|
|
/**
|
|
Initialize instance options.
|
|
|
|
SYNOPSIS
|
|
init()
|
|
name_arg name of the instance
|
|
|
|
RETURN:
|
|
FALSE - ok
|
|
TRUE - error
|
|
*/
|
|
|
|
bool Instance::init(const LEX_STRING *name_arg)
|
|
{
|
|
mysqld_compatible= is_mysqld_compatible_name(name_arg);
|
|
|
|
return options.init(name_arg);
|
|
}
|
|
|
|
|
|
/**
|
|
Complete instance options initialization.
|
|
|
|
SYNOPSIS
|
|
complete_initialization()
|
|
|
|
RETURN
|
|
FALSE - ok
|
|
TRUE - error
|
|
*/
|
|
|
|
bool Instance::complete_initialization()
|
|
{
|
|
configured= ! options.complete_initialization();
|
|
return FALSE;
|
|
/*
|
|
TODO: return actual status (from
|
|
Instance_options::complete_initialization()) here.
|
|
*/
|
|
}
|
|
|
|
/**************************************************************************
|
|
}}}
|
|
**************************************************************************/
|
|
|
|
|
|
/**************************************************************************
|
|
{{{ Instance: public interface implementation.
|
|
**************************************************************************/
|
|
|
|
/**
|
|
Determine if there is some activity with the instance.
|
|
|
|
SYNOPSIS
|
|
is_active()
|
|
|
|
DESCRIPTION
|
|
An instance is active if one of the following conditions is true:
|
|
- Instance-monitoring thread is running;
|
|
- Instance is guarded and its state is other than STOPPED;
|
|
- Corresponding mysqld-server accepts connections.
|
|
|
|
MT-NOTE: instance must be locked before calling the operation.
|
|
|
|
RETURN
|
|
TRUE - instance is active
|
|
FALSE - otherwise.
|
|
*/
|
|
|
|
bool Instance::is_active()
|
|
{
|
|
if (monitoring_thread_active)
|
|
return TRUE;
|
|
|
|
if (is_guarded() && get_state() != STOPPED)
|
|
return TRUE;
|
|
|
|
return is_mysqld_running();
|
|
}
|
|
|
|
|
|
/**
|
|
Determine if mysqld is accepting connections.
|
|
|
|
SYNOPSIS
|
|
is_mysqld_running()
|
|
|
|
DESCRIPTION
|
|
Try to connect to mysqld with fake login/password to check whether it is
|
|
accepting connections or not.
|
|
|
|
MT-NOTE: instance must be locked before calling the operation.
|
|
|
|
RETURN
|
|
TRUE - mysqld is alive and accept connections
|
|
FALSE - otherwise.
|
|
*/
|
|
|
|
bool Instance::is_mysqld_running()
|
|
{
|
|
MYSQL mysql;
|
|
uint port= options.get_mysqld_port(); /* 0 if not specified. */
|
|
const char *socket= NULL;
|
|
static const char *password= "check_connection";
|
|
static const char *username= "MySQL_Instance_Manager";
|
|
static const char *access_denied_message= "Access denied for user";
|
|
bool return_val;
|
|
|
|
if (options.mysqld_socket)
|
|
socket= options.mysqld_socket;
|
|
|
|
/* no port was specified => instance falled back to default value */
|
|
if (!port && !options.mysqld_socket)
|
|
port= SERVER_DEFAULT_PORT;
|
|
|
|
mysql_init(&mysql);
|
|
/* try to connect to a server with a fake username/password pair */
|
|
if (mysql_real_connect(&mysql, LOCAL_HOST, username,
|
|
password,
|
|
NullS, port,
|
|
socket, 0))
|
|
{
|
|
/*
|
|
We have successfully connected to the server using fake
|
|
username/password. Write a warning to the logfile.
|
|
*/
|
|
log_error("Instance '%s': was able to log into mysqld.",
|
|
(const char *) get_name()->str);
|
|
return_val= TRUE; /* server is alive */
|
|
}
|
|
else
|
|
return_val= test(!strncmp(access_denied_message, mysql_error(&mysql),
|
|
sizeof(access_denied_message) - 1));
|
|
|
|
mysql_close(&mysql);
|
|
|
|
return return_val;
|
|
}
|
|
|
|
|
|
/**
|
|
Start mysqld.
|
|
|
|
SYNOPSIS
|
|
start_mysqld()
|
|
|
|
DESCRIPTION
|
|
Reset flags and start Instance Monitor thread, which will start mysqld.
|
|
|
|
MT-NOTE: instance must be locked before calling the operation.
|
|
|
|
RETURN
|
|
FALSE - ok
|
|
TRUE - could not start instance
|
|
*/
|
|
|
|
bool Instance::start_mysqld()
|
|
{
|
|
Instance_monitor *instance_monitor;
|
|
|
|
/*
|
|
Prepare instance to start Instance Monitor thread.
|
|
|
|
NOTE: It's important to set these actions here in order to avoid
|
|
race conditions -- these actions must be done under acquired lock on
|
|
Instance.
|
|
*/
|
|
|
|
crashed= FALSE;
|
|
monitoring_thread_active= TRUE;
|
|
|
|
remove_pid();
|
|
|
|
/* Create and start the Instance Monitor thread. */
|
|
|
|
instance_monitor= new Instance_monitor(this);
|
|
|
|
if (instance_monitor == NULL || instance_monitor->start(Thread::DETACHED))
|
|
{
|
|
delete instance_monitor;
|
|
monitoring_thread_active= FALSE;
|
|
|
|
log_error("Instance '%s': can not create instance monitor thread.",
|
|
(const char *) get_name()->str);
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
++restart_counter;
|
|
|
|
/* The Instance Monitor thread will delete itself when it's finished. */
|
|
|
|
return FALSE;
|
|
}
|
|
|
|
|
|
/**
|
|
Stop mysqld.
|
|
|
|
SYNOPSIS
|
|
stop_mysqld()
|
|
|
|
DESCRIPTION
|
|
Try to stop mysqld gracefully. Otherwise kill it with SIGKILL.
|
|
|
|
MT-NOTE: instance must be locked before calling the operation.
|
|
|
|
RETURN
|
|
FALSE - ok
|
|
TRUE - could not stop the instance
|
|
*/
|
|
|
|
bool Instance::stop_mysqld()
|
|
{
|
|
log_info("Instance '%s': stopping mysqld...",
|
|
(const char *) get_name()->str);
|
|
|
|
kill_mysqld(SIGTERM);
|
|
|
|
if (!wait_for_stop())
|
|
{
|
|
log_info("Instance '%s': mysqld stopped gracefully.",
|
|
(const char *) get_name()->str);
|
|
return FALSE;
|
|
}
|
|
|
|
log_info("Instance '%s': mysqld failed to stop gracefully within %d seconds.",
|
|
(const char *) get_name()->str,
|
|
(int) options.get_shutdown_delay());
|
|
|
|
log_info("Instance'%s': killing mysqld...",
|
|
(const char *) get_name()->str);
|
|
|
|
kill_mysqld(SIGKILL);
|
|
|
|
if (!wait_for_stop())
|
|
{
|
|
log_info("Instance '%s': mysqld has been killed.",
|
|
(const char *) get_name()->str);
|
|
return FALSE;
|
|
}
|
|
|
|
log_info("Instance '%s': can not kill mysqld within %d seconds.",
|
|
(const char *) get_name()->str,
|
|
(int) options.get_shutdown_delay());
|
|
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
/**
|
|
Send signal to mysqld.
|
|
|
|
SYNOPSIS
|
|
kill_mysqld()
|
|
|
|
DESCRIPTION
|
|
Load pid from the pid file and send the given signal to that process.
|
|
If the signal is SIGKILL, remove the pid file after sending the signal.
|
|
|
|
MT-NOTE: instance must be locked before calling the operation.
|
|
|
|
TODO
|
|
This too low-level and OS-specific operation for public interface.
|
|
Also, it has some implicit behaviour for SIGKILL signal. Probably, we
|
|
should have the following public operations instead:
|
|
- start_mysqld() -- as is;
|
|
- stop_mysqld -- request mysqld to shutdown gracefully (send SIGTERM);
|
|
don't wait for complete shutdown;
|
|
- wait_for_stop() (or join_mysqld()) -- wait for mysqld to stop within
|
|
time interval;
|
|
- kill_mysqld() -- request to terminate mysqld; don't wait for
|
|
completion.
|
|
These operations should also be used in Guardian to manage instances.
|
|
*/
|
|
|
|
void Instance::kill_mysqld(int signum)
|
|
{
|
|
pid_t mysqld_pid= options.load_pid();
|
|
|
|
if (mysqld_pid == 0)
|
|
{
|
|
log_info("Instance '%s': no pid file to send a signal (%d).",
|
|
(const char *) get_name()->str,
|
|
(int) signum);
|
|
return;
|
|
}
|
|
|
|
log_info("Instance '%s': sending %d to %d...",
|
|
(const char *) get_name()->str,
|
|
(int) signum,
|
|
(int) mysqld_pid);
|
|
|
|
if (kill(mysqld_pid, signum))
|
|
{
|
|
log_info("Instance '%s': kill() failed.",
|
|
(const char *) get_name()->str);
|
|
return;
|
|
}
|
|
|
|
/* Kill suceeded */
|
|
if (signum == SIGKILL) /* really killed instance with SIGKILL */
|
|
{
|
|
log_error("Instance '%s': killed.",
|
|
(const char *) options.instance_name.str);
|
|
|
|
/* After sucessful hard kill the pidfile need to be removed */
|
|
options.unlink_pidfile();
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
Lock instance.
|
|
*/
|
|
|
|
void Instance::lock()
|
|
{
|
|
pthread_mutex_lock(&LOCK_instance);
|
|
}
|
|
|
|
|
|
/**
|
|
Unlock instance.
|
|
*/
|
|
|
|
void Instance::unlock()
|
|
{
|
|
pthread_mutex_unlock(&LOCK_instance);
|
|
}
|
|
|
|
|
|
/**
|
|
Return instance state name.
|
|
|
|
SYNOPSIS
|
|
get_state_name()
|
|
|
|
DESCRIPTION
|
|
The operation returns user-friendly state name. The operation can be
|
|
used both for guarded and non-guarded instances.
|
|
|
|
MT-NOTE: instance must be locked before calling the operation.
|
|
|
|
TODO: Replace with the static get_state_name(state_code) function.
|
|
*/
|
|
|
|
const char *Instance::get_state_name()
|
|
{
|
|
if (!is_configured())
|
|
return "misconfigured";
|
|
|
|
if (is_guarded())
|
|
{
|
|
/* The instance is managed by Guardian: we can report precise state. */
|
|
|
|
return get_instance_state_name(get_state());
|
|
}
|
|
|
|
/* The instance is not managed by Guardian: we can report status only. */
|
|
|
|
return is_active() ? "online" : "offline";
|
|
}
|
|
|
|
|
|
/**
|
|
Reset statistics.
|
|
|
|
SYNOPSIS
|
|
reset_stat()
|
|
|
|
DESCRIPTION
|
|
The operation resets statistics used for guarding the instance.
|
|
|
|
MT-NOTE: instance must be locked before calling the operation.
|
|
|
|
TODO: Make private.
|
|
*/
|
|
|
|
void Instance::reset_stat()
|
|
{
|
|
restart_counter= 0;
|
|
crash_moment= 0;
|
|
last_checked= 0;
|
|
}
|
|
|
|
/**************************************************************************
|
|
}}}
|
|
**************************************************************************/
|
|
|
|
|
|
/**************************************************************************
|
|
{{{ Instance: implementation of private operations.
|
|
**************************************************************************/
|
|
|
|
/**
|
|
Remove pid file.
|
|
*/
|
|
|
|
void Instance::remove_pid()
|
|
{
|
|
int mysqld_pid= options.load_pid();
|
|
|
|
if (mysqld_pid == 0)
|
|
return;
|
|
|
|
if (options.unlink_pidfile())
|
|
{
|
|
log_error("Instance '%s': can not unlink pid file.",
|
|
(const char *) options.instance_name.str);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
Wait for mysqld to stop within shutdown interval.
|
|
*/
|
|
|
|
bool Instance::wait_for_stop()
|
|
{
|
|
int start_time= (int) time(NULL);
|
|
int finish_time= start_time + options.get_shutdown_delay();
|
|
|
|
log_info("Instance '%s': waiting for mysqld to stop "
|
|
"(timeout: %d seconds)...",
|
|
(const char *) get_name()->str,
|
|
(int) options.get_shutdown_delay());
|
|
|
|
while (true)
|
|
{
|
|
if (options.load_pid() == 0 && !is_mysqld_running())
|
|
return FALSE;
|
|
|
|
if (time(NULL) >= finish_time)
|
|
return TRUE;
|
|
|
|
/* Sleep for 0.3 sec and check again. */
|
|
|
|
my_sleep(300000);
|
|
}
|
|
}
|
|
|
|
/**************************************************************************
|
|
}}}
|
|
**************************************************************************/
|