2004-10-23 11:32:52 +04:00
|
|
|
/* 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; 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 */
|
|
|
|
|
|
|
|
#ifdef __GNUC__
|
|
|
|
#pragma implementation
|
|
|
|
#endif
|
|
|
|
|
2005-07-20 10:55:40 -05:00
|
|
|
#ifdef __WIN__
|
|
|
|
#include <process.h>
|
|
|
|
#endif
|
2004-10-23 11:32:52 +04:00
|
|
|
#include "instance.h"
|
2005-03-22 02:04:14 +03:00
|
|
|
|
2004-10-23 11:32:52 +04:00
|
|
|
#include "mysql_manager_error.h"
|
2004-10-26 23:22:12 +04:00
|
|
|
#include "log.h"
|
2005-01-25 13:54:56 +03:00
|
|
|
#include "instance_map.h"
|
2005-02-27 18:41:34 +03:00
|
|
|
#include "priv.h"
|
2005-07-20 10:55:40 -05:00
|
|
|
#include "port.h"
|
|
|
|
#ifndef __WIN__
|
2005-03-22 02:04:14 +03:00
|
|
|
#include <sys/wait.h>
|
2005-07-20 10:55:40 -05:00
|
|
|
#endif
|
2004-10-23 11:32:52 +04:00
|
|
|
#include <my_sys.h>
|
2005-03-22 10:39:26 +01:00
|
|
|
#include <signal.h>
|
2004-10-23 11:32:52 +04:00
|
|
|
#include <m_string.h>
|
2005-03-22 02:04:14 +03:00
|
|
|
#include <mysql.h>
|
2005-02-11 14:21:59 +03:00
|
|
|
|
|
|
|
C_MODE_START
|
|
|
|
|
2005-02-27 18:41:34 +03:00
|
|
|
/*
|
|
|
|
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.
|
|
|
|
*/
|
|
|
|
|
2005-02-11 14:21:59 +03:00
|
|
|
pthread_handler_decl(proxy, arg)
|
|
|
|
{
|
|
|
|
Instance *instance= (Instance *) arg;
|
|
|
|
instance->fork_and_monitor();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
C_MODE_END
|
|
|
|
|
|
|
|
|
2005-07-20 10:55:40 -05:00
|
|
|
void Instance::remove_pid()
|
|
|
|
{
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
int pid;
|
|
|
|
if ((pid= options.get_pid()) != 0) /* check the pidfile */
|
|
|
|
if (options.unlink_pidfile()) /* remove stalled pidfile */
|
|
|
|
log_error("cannot remove pidfile for instance %i, this might be \
|
|
|
|
since IM lacks permmissions or hasn't found the pidifle",
|
|
|
|
options.instance_name);
|
2005-07-20 10:55:40 -05:00
|
|
|
}
|
|
|
|
|
2004-10-23 11:32:52 +04:00
|
|
|
/*
|
|
|
|
The method starts an instance.
|
|
|
|
|
|
|
|
SYNOPSYS
|
|
|
|
start()
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 ok
|
|
|
|
ER_CANNOT_START_INSTANCE Cannot start instance
|
|
|
|
ER_INSTANCE_ALREADY_STARTED The instance on the specified port/socket
|
|
|
|
is already started
|
|
|
|
*/
|
|
|
|
|
|
|
|
int Instance::start()
|
|
|
|
{
|
2005-02-11 14:21:59 +03:00
|
|
|
/* clear crash flag */
|
|
|
|
pthread_mutex_lock(&LOCK_instance);
|
|
|
|
crashed= 0;
|
|
|
|
pthread_mutex_unlock(&LOCK_instance);
|
|
|
|
|
|
|
|
|
2004-10-23 11:32:52 +04:00
|
|
|
if (!is_running())
|
|
|
|
{
|
2005-07-20 10:55:40 -05:00
|
|
|
remove_pid();
|
more fixes for IM to substitude mysqld_safe in startup scripts
BitKeeper/deleted/.del-thread_repository.cc~bba09f64f8cb4037:
Delete: server-tools/instance-manager/thread_repository.cc
BitKeeper/deleted/.del-thread_repository.h~e6a3b9cab7a6612a:
Delete: server-tools/instance-manager/thread_repository.h
server-tools/instance-manager/commands.cc:
All instances are guarded by default now, so we need to perform check on whether the instance is nonguarded,
rather then guarded when adding it to the list of guarded instnces.
server-tools/instance-manager/guardian.cc:
Guardian rewritten to start instances by default, and shut them down, when exiting. Behaviour of the guardian
in case of the instance crash has changed. Now it tries to restart an instance constantly in the first 2
seconds after the crash was noticed, and then it tries restart an instance once in the MONITORING_INTERVAL.
If it failed to restart instance for "restart_retry" (compiled-in value) times, guardian stops trying to
restart it.
server-tools/instance-manager/guardian.h:
Several new functions and variables declared.
server-tools/instance-manager/instance.cc:
now start doesn't call stop(), but rather tries to remove the pidfile itself
server-tools/instance-manager/instance.h:
cleanup
server-tools/instance-manager/instance_map.cc:
no more "admin" options
server-tools/instance-manager/instance_map.h:
User and password purged from instance_map options, as IM shouldn't know them
server-tools/instance-manager/instance_options.cc:
new option added -- shutdown_delay, guarded option now called nonguaded and has the opposite meaning
server-tools/instance-manager/instance_options.h:
appropriate changes, reflecting options addition/removal
server-tools/instance-manager/manager.cc:
shutdown process is complicated a bit -- at first signal thread should stop guardian, and only then the IM
itself
server-tools/instance-manager/messages.cc:
update error message
server-tools/instance-manager/options.cc:
admin user/password purged from mysqlmanager options
2005-01-31 23:54:08 +03:00
|
|
|
|
2005-02-11 14:21:59 +03:00
|
|
|
/*
|
|
|
|
No need to monitor this thread in the Thread_registry, as all
|
|
|
|
instances are to be stopped during shutdown.
|
|
|
|
*/
|
|
|
|
pthread_t proxy_thd_id;
|
|
|
|
pthread_attr_t proxy_thd_attr;
|
|
|
|
int rc;
|
|
|
|
|
|
|
|
pthread_attr_init(&proxy_thd_attr);
|
|
|
|
pthread_attr_setdetachstate(&proxy_thd_attr, PTHREAD_CREATE_DETACHED);
|
|
|
|
rc= pthread_create(&proxy_thd_id, &proxy_thd_attr, proxy,
|
|
|
|
this);
|
|
|
|
pthread_attr_destroy(&proxy_thd_attr);
|
|
|
|
if (rc)
|
|
|
|
{
|
|
|
|
log_error("Instance::start(): pthread_create(proxy) failed");
|
2004-10-23 11:32:52 +04:00
|
|
|
return ER_CANNOT_START_INSTANCE;
|
|
|
|
}
|
2005-02-11 14:21:59 +03:00
|
|
|
|
|
|
|
return 0;
|
2004-10-23 11:32:52 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* the instance is started already */
|
|
|
|
return ER_INSTANCE_ALREADY_STARTED;
|
|
|
|
}
|
|
|
|
|
2005-07-20 10:55:40 -05:00
|
|
|
#ifndef __WIN__
|
|
|
|
int Instance::launch_and_wait()
|
2005-02-11 14:21:59 +03:00
|
|
|
{
|
2005-08-03 16:20:27 -05:00
|
|
|
pid_t pid= fork();
|
2005-07-20 10:55:40 -05:00
|
|
|
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
switch (pid) {
|
|
|
|
case 0:
|
|
|
|
execv(options.mysqld_path, options.argv);
|
|
|
|
/* exec never returns */
|
|
|
|
exit(1);
|
|
|
|
case -1:
|
|
|
|
log_info("cannot fork() to start instance %s", options.instance_name);
|
|
|
|
return -1;
|
|
|
|
default:
|
2005-02-27 18:41:34 +03:00
|
|
|
/*
|
|
|
|
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 (linuxthreads)
|
|
|
|
wait(NULL); /* LinuxThreads were detected */
|
|
|
|
else
|
|
|
|
waitpid(pid, NULL, 0);
|
2005-02-11 14:21:59 +03:00
|
|
|
}
|
2005-07-20 10:55:40 -05:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
int Instance::launch_and_wait()
|
|
|
|
{
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
STARTUPINFO si;
|
|
|
|
PROCESS_INFORMATION pi;
|
2005-07-20 10:55:40 -05:00
|
|
|
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
ZeroMemory(&si, sizeof(si));
|
|
|
|
si.cb= sizeof(si);
|
|
|
|
ZeroMemory(&pi, sizeof(pi));
|
2005-07-20 10:55:40 -05:00
|
|
|
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
int cmdlen= 0;
|
|
|
|
for (int i= 1; options.argv[i] != 0; i++)
|
|
|
|
cmdlen+= strlen(options.argv[i]) + 1;
|
|
|
|
cmdlen++; // we have to add a single space for CreateProcess (read the docs)
|
2005-07-20 10:55:40 -05:00
|
|
|
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
char *cmdline= NULL;
|
|
|
|
if (cmdlen > 0)
|
|
|
|
{
|
|
|
|
cmdline= new char[cmdlen];
|
|
|
|
cmdline[0]= 0;
|
|
|
|
for (int i= 1; options.argv[i] != 0; i++)
|
2005-07-20 10:55:40 -05:00
|
|
|
{
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
strcat(cmdline, " ");
|
|
|
|
strcat(cmdline, options.argv[i]);
|
2005-07-20 10:55:40 -05:00
|
|
|
}
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
}
|
2005-07-20 10:55:40 -05:00
|
|
|
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
// Start the child process.
|
|
|
|
BOOL result= CreateProcess(options.mysqld_path, // file to execute
|
|
|
|
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;
|
|
|
|
if (! result)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
// 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);
|
|
|
|
|
|
|
|
return exitcode;
|
2005-07-20 10:55:40 -05:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
void Instance::fork_and_monitor()
|
|
|
|
{
|
|
|
|
log_info("starting instance %s", options.instance_name);
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
|
|
|
|
if (launch_and_wait())
|
|
|
|
return; /* error is logged */
|
2005-07-20 10:55:40 -05:00
|
|
|
|
|
|
|
/* set instance state to crashed */
|
|
|
|
pthread_mutex_lock(&LOCK_instance);
|
|
|
|
crashed= 1;
|
|
|
|
pthread_mutex_unlock(&LOCK_instance);
|
|
|
|
|
|
|
|
/*
|
|
|
|
Wake connection threads waiting for an instance to stop. This
|
|
|
|
is needed if a user issued command to stop an instance via
|
|
|
|
mysql connection. This is not the case if Guardian stop the thread.
|
|
|
|
*/
|
|
|
|
pthread_cond_signal(&COND_instance_stopped);
|
|
|
|
/* wake guardian */
|
|
|
|
pthread_cond_signal(&instance_map->guardian->COND_guardian);
|
|
|
|
/* thread exits */
|
|
|
|
return;
|
2005-02-11 14:21:59 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Instance::Instance(): crashed(0)
|
|
|
|
{
|
|
|
|
pthread_mutex_init(&LOCK_instance, 0);
|
2005-02-27 18:41:34 +03:00
|
|
|
pthread_cond_init(&COND_instance_stopped, 0);
|
2005-02-11 14:21:59 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-10-23 11:32:52 +04:00
|
|
|
Instance::~Instance()
|
|
|
|
{
|
2005-02-27 18:41:34 +03:00
|
|
|
pthread_cond_destroy(&COND_instance_stopped);
|
2004-10-23 11:32:52 +04:00
|
|
|
pthread_mutex_destroy(&LOCK_instance);
|
2005-02-11 14:21:59 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int Instance::is_crashed()
|
|
|
|
{
|
|
|
|
int val;
|
|
|
|
pthread_mutex_lock(&LOCK_instance);
|
|
|
|
val= crashed;
|
|
|
|
pthread_mutex_unlock(&LOCK_instance);
|
|
|
|
return val;
|
2004-10-23 11:32:52 +04:00
|
|
|
}
|
|
|
|
|
2004-11-02 10:11:03 +03:00
|
|
|
|
2004-10-23 11:32:52 +04:00
|
|
|
bool Instance::is_running()
|
|
|
|
{
|
2005-01-25 13:54:56 +03:00
|
|
|
MYSQL mysql;
|
2004-12-12 20:59:15 +03:00
|
|
|
uint port= 0;
|
|
|
|
const char *socket= NULL;
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
static const char *password= "check_connection";
|
|
|
|
static const char *username= "MySQL_Instance_Manager";
|
|
|
|
static const char *access_denied_message= "Access denied for user";
|
2005-01-25 13:54:56 +03:00
|
|
|
bool return_val;
|
2004-11-02 10:11:03 +03:00
|
|
|
|
|
|
|
if (options.mysqld_port)
|
2005-02-27 18:41:34 +03:00
|
|
|
port= options.mysqld_port_val;
|
2004-11-02 10:11:03 +03:00
|
|
|
|
|
|
|
if (options.mysqld_socket)
|
|
|
|
socket= strchr(options.mysqld_socket, '=') + 1;
|
|
|
|
|
2004-10-23 11:32:52 +04:00
|
|
|
pthread_mutex_lock(&LOCK_instance);
|
2005-01-25 13:54:56 +03:00
|
|
|
|
|
|
|
mysql_init(&mysql);
|
2005-02-11 14:21:59 +03:00
|
|
|
/* try to connect to a server with a fake username/password pair */
|
2005-01-25 13:54:56 +03:00
|
|
|
if (mysql_real_connect(&mysql, LOCAL_HOST, username,
|
|
|
|
password,
|
|
|
|
NullS, port,
|
|
|
|
socket, 0))
|
2004-10-23 11:32:52 +04:00
|
|
|
{
|
2005-01-25 13:54:56 +03:00
|
|
|
/*
|
2005-02-11 14:21:59 +03:00
|
|
|
We have successfully connected to the server using fake
|
|
|
|
username/password. Write a warning to the logfile.
|
2005-01-25 13:54:56 +03:00
|
|
|
*/
|
|
|
|
log_info("The Instance Manager was able to log into you server \
|
|
|
|
with faked compiled-in password while checking server status. \
|
|
|
|
Looks like something is wrong.");
|
2004-10-23 11:32:52 +04:00
|
|
|
pthread_mutex_unlock(&LOCK_instance);
|
2005-01-25 13:54:56 +03:00
|
|
|
return_val= TRUE; /* server is alive */
|
2004-10-23 11:32:52 +04:00
|
|
|
}
|
2005-01-25 13:54:56 +03:00
|
|
|
else
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
return_val= test(!strncmp(access_denied_message, mysql_error(&mysql),
|
|
|
|
sizeof(access_denied_message) - 1));
|
2005-01-25 13:54:56 +03:00
|
|
|
|
|
|
|
mysql_close(&mysql);
|
2004-10-23 11:32:52 +04:00
|
|
|
pthread_mutex_unlock(&LOCK_instance);
|
2005-01-25 13:54:56 +03:00
|
|
|
|
|
|
|
return return_val;
|
2004-10-23 11:32:52 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Stop an instance.
|
|
|
|
|
|
|
|
SYNOPSYS
|
|
|
|
stop()
|
|
|
|
|
|
|
|
RETURN:
|
|
|
|
0 ok
|
|
|
|
ER_INSTANCE_IS_NOT_STARTED Looks like the instance it is not started
|
|
|
|
ER_STOP_INSTANCE mysql_shutdown reported an error
|
|
|
|
*/
|
|
|
|
|
|
|
|
int Instance::stop()
|
|
|
|
{
|
2005-01-25 13:54:56 +03:00
|
|
|
struct timespec timeout;
|
2005-02-27 18:41:34 +03:00
|
|
|
uint waitchild= (uint) DEFAULT_SHUTDOWN_DELAY;
|
more fixes for IM to substitude mysqld_safe in startup scripts
BitKeeper/deleted/.del-thread_repository.cc~bba09f64f8cb4037:
Delete: server-tools/instance-manager/thread_repository.cc
BitKeeper/deleted/.del-thread_repository.h~e6a3b9cab7a6612a:
Delete: server-tools/instance-manager/thread_repository.h
server-tools/instance-manager/commands.cc:
All instances are guarded by default now, so we need to perform check on whether the instance is nonguarded,
rather then guarded when adding it to the list of guarded instnces.
server-tools/instance-manager/guardian.cc:
Guardian rewritten to start instances by default, and shut them down, when exiting. Behaviour of the guardian
in case of the instance crash has changed. Now it tries to restart an instance constantly in the first 2
seconds after the crash was noticed, and then it tries restart an instance once in the MONITORING_INTERVAL.
If it failed to restart instance for "restart_retry" (compiled-in value) times, guardian stops trying to
restart it.
server-tools/instance-manager/guardian.h:
Several new functions and variables declared.
server-tools/instance-manager/instance.cc:
now start doesn't call stop(), but rather tries to remove the pidfile itself
server-tools/instance-manager/instance.h:
cleanup
server-tools/instance-manager/instance_map.cc:
no more "admin" options
server-tools/instance-manager/instance_map.h:
User and password purged from instance_map options, as IM shouldn't know them
server-tools/instance-manager/instance_options.cc:
new option added -- shutdown_delay, guarded option now called nonguaded and has the opposite meaning
server-tools/instance-manager/instance_options.h:
appropriate changes, reflecting options addition/removal
server-tools/instance-manager/manager.cc:
shutdown process is complicated a bit -- at first signal thread should stop guardian, and only then the IM
itself
server-tools/instance-manager/messages.cc:
update error message
server-tools/instance-manager/options.cc:
admin user/password purged from mysqlmanager options
2005-01-31 23:54:08 +03:00
|
|
|
|
2005-02-27 18:41:34 +03:00
|
|
|
if (options.shutdown_delay_val)
|
|
|
|
waitchild= options.shutdown_delay_val;
|
2005-01-25 13:54:56 +03:00
|
|
|
|
2005-02-11 14:21:59 +03:00
|
|
|
kill_instance(SIGTERM);
|
|
|
|
/* sleep on condition to wait for SIGCHLD */
|
2005-01-25 13:54:56 +03:00
|
|
|
|
2005-02-11 14:21:59 +03:00
|
|
|
timeout.tv_sec= time(NULL) + waitchild;
|
|
|
|
timeout.tv_nsec= 0;
|
|
|
|
if (pthread_mutex_lock(&LOCK_instance))
|
|
|
|
goto err;
|
2005-01-25 13:54:56 +03:00
|
|
|
|
2005-02-11 14:21:59 +03:00
|
|
|
while (options.get_pid() != 0) /* while server isn't stopped */
|
|
|
|
{
|
|
|
|
int status;
|
2005-01-25 13:54:56 +03:00
|
|
|
|
2005-02-27 18:41:34 +03:00
|
|
|
status= pthread_cond_timedwait(&COND_instance_stopped,
|
2005-02-11 14:21:59 +03:00
|
|
|
&LOCK_instance,
|
|
|
|
&timeout);
|
|
|
|
if (status == ETIMEDOUT)
|
|
|
|
break;
|
|
|
|
}
|
2005-01-25 13:54:56 +03:00
|
|
|
|
2005-02-11 14:21:59 +03:00
|
|
|
pthread_mutex_unlock(&LOCK_instance);
|
2005-01-25 13:54:56 +03:00
|
|
|
|
2005-02-11 14:21:59 +03:00
|
|
|
kill_instance(SIGKILL);
|
2005-01-25 13:54:56 +03:00
|
|
|
|
2005-02-11 14:21:59 +03:00
|
|
|
return 0;
|
2004-10-23 11:32:52 +04:00
|
|
|
|
|
|
|
return ER_INSTANCE_IS_NOT_STARTED;
|
|
|
|
err:
|
|
|
|
return ER_STOP_INSTANCE;
|
|
|
|
}
|
|
|
|
|
2005-07-20 10:55:40 -05:00
|
|
|
#ifdef __WIN__
|
|
|
|
|
|
|
|
BOOL SafeTerminateProcess(HANDLE hProcess, UINT uExitCode)
|
|
|
|
{
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
DWORD dwTID, dwCode, dwErr= 0;
|
2005-08-03 16:20:27 -05:00
|
|
|
HANDLE hProcessDup= INVALID_HANDLE_VALUE;
|
|
|
|
HANDLE hRT= NULL;
|
|
|
|
HINSTANCE hKernel= GetModuleHandle("Kernel32");
|
|
|
|
BOOL bSuccess= FALSE;
|
2005-07-20 10:55:40 -05:00
|
|
|
|
2005-08-03 16:20:27 -05:00
|
|
|
BOOL bDup= DuplicateHandle(GetCurrentProcess(),
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
hProcess, GetCurrentProcess(), &hProcessDup,
|
2005-08-03 16:20:27 -05:00
|
|
|
PROCESS_ALL_ACCESS, FALSE, 0);
|
2005-07-20 10:55:40 -05:00
|
|
|
|
|
|
|
// Detect the special case where the process is
|
|
|
|
// already dead...
|
2005-08-03 16:20:27 -05:00
|
|
|
if (GetExitCodeProcess((bDup) ? hProcessDup : hProcess, &dwCode) &&
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
(dwCode == STILL_ACTIVE))
|
2005-07-20 10:55:40 -05:00
|
|
|
{
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
FARPROC pfnExitProc;
|
2005-07-20 10:55:40 -05:00
|
|
|
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
pfnExitProc= GetProcAddress(hKernel, "ExitProcess");
|
2005-07-20 10:55:40 -05:00
|
|
|
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
hRT= CreateRemoteThread((bDup) ? hProcessDup : hProcess, NULL, 0,
|
|
|
|
(LPTHREAD_START_ROUTINE)pfnExitProc,
|
|
|
|
(PVOID)uExitCode, 0, &dwTID);
|
2005-07-20 10:55:40 -05:00
|
|
|
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
if (hRT == NULL)
|
|
|
|
dwErr= GetLastError();
|
2005-07-20 10:55:40 -05:00
|
|
|
}
|
|
|
|
else
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
dwErr= ERROR_PROCESS_ABORTED;
|
2005-07-20 10:55:40 -05:00
|
|
|
|
2005-08-03 16:20:27 -05:00
|
|
|
if (hRT)
|
2005-07-20 10:55:40 -05:00
|
|
|
{
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
// Must wait process to terminate to
|
|
|
|
// guarantee that it has exited...
|
|
|
|
WaitForSingleObject((bDup) ? hProcessDup : hProcess, INFINITE);
|
2005-07-20 10:55:40 -05:00
|
|
|
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
CloseHandle(hRT);
|
|
|
|
bSuccess= TRUE;
|
2005-07-20 10:55:40 -05:00
|
|
|
}
|
|
|
|
|
2005-08-03 16:20:27 -05:00
|
|
|
if (bDup)
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
CloseHandle(hProcessDup);
|
2005-07-20 10:55:40 -05:00
|
|
|
|
2005-08-03 16:20:27 -05:00
|
|
|
if (!bSuccess)
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
SetLastError(dwErr);
|
2005-07-20 10:55:40 -05:00
|
|
|
|
|
|
|
return bSuccess;
|
IM port cleanup
server-tools/instance-manager/IMService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.cpp:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/WindowsService.h:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/instance.cc:
cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/listener.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/manager.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/options.cc:
coding style fixes: tabs, trailing spaces, offset e.t.c
server-tools/instance-manager/user_map.cc:
simplify password file processing
2005-08-05 17:02:06 +04:00
|
|
|
}
|
2005-07-20 10:55:40 -05:00
|
|
|
|
|
|
|
int kill(pid_t pid, int signum)
|
|
|
|
{
|
2005-08-03 16:20:27 -05:00
|
|
|
HANDLE processhandle= ::OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid);
|
2005-07-20 10:55:40 -05:00
|
|
|
if (signum == SIGTERM)
|
|
|
|
::SafeTerminateProcess(processhandle, 0);
|
|
|
|
else
|
|
|
|
::TerminateProcess(processhandle, -1);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2005-02-11 14:21:59 +03:00
|
|
|
void Instance::kill_instance(int signum)
|
|
|
|
{
|
|
|
|
pid_t pid;
|
|
|
|
/* if there are no pid, everything seems to be fine */
|
|
|
|
if ((pid= options.get_pid()) != 0) /* get pid from pidfile */
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
If we cannot kill mysqld, then it has propably crashed.
|
|
|
|
Let us try to remove staled pidfile and return successfully
|
|
|
|
as mysqld is probably stopped.
|
|
|
|
*/
|
|
|
|
if (!kill(pid, signum))
|
|
|
|
options.unlink_pidfile();
|
2005-05-16 01:54:02 +04:00
|
|
|
else if (signum == SIGKILL) /* really killed instance with SIGKILL */
|
|
|
|
log_error("The instance %s is being stopped forsibly. Normally \
|
|
|
|
it should not happed. Probably the instance has been \
|
|
|
|
hanging. You should also check your IM setup",
|
|
|
|
options.instance_name);
|
2005-02-11 14:21:59 +03:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2004-10-23 11:32:52 +04:00
|
|
|
/*
|
|
|
|
We execute this function to initialize instance parameters.
|
|
|
|
Return value: 0 - ok. 1 - unable to init DYNAMIC_ARRAY.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int Instance::init(const char *name_arg)
|
|
|
|
{
|
|
|
|
return options.init(name_arg);
|
|
|
|
}
|
2005-01-25 13:54:56 +03:00
|
|
|
|
|
|
|
|
2005-02-15 04:38:33 +03:00
|
|
|
int Instance::complete_initialization(Instance_map *instance_map_arg,
|
2005-02-18 14:58:30 +03:00
|
|
|
const char *mysqld_path,
|
2005-06-07 15:47:02 +04:00
|
|
|
uint instance_type)
|
2005-01-25 13:54:56 +03:00
|
|
|
{
|
|
|
|
instance_map= instance_map_arg;
|
2005-06-07 15:47:02 +04:00
|
|
|
return options.complete_initialization(mysqld_path, instance_type);
|
2005-01-25 13:54:56 +03:00
|
|
|
}
|