mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +01:00
3b74668bfa
tests fail on FreeBSD. The patch contains of the following: - make Instance Manager, running in the daemon mode, dump the pid of angel-process in the special file; - default value of angel-pid-file-name is 'mysqlmanager.angel.pid'; - if ordinary (IM) pid-file-name is specified in the configuration, angel-pid-file-name is updated according to the following rule: extension of the basename of pid-file-name is replaced by '.angel.pid. For example: - pid-file-name: /tmp/im.pid => angel-pid-file-name: /tmp/im.angel.pid - pid-file-name: /tmp/im.txt => angel-pid-file-name: /tmp/im.angel.pid - pid-file-name: /tmp/5.0/im => angel-pid-file-name: /tmp/5.0/im.angel.pid - add support for configuration option to customize angel pid file name; - fix test suite to use angel pid to kill Instance Manager by all means if something went wrong. Background ---------- The problem is that on some OSes (FreeBSD for one) Instance Manager does not get SIGTERM, so can not shutdown gracefully. Test suite wasn't able to cope with it, so this leads to the mess in test results. The problem should be split into two: - fix signal handling; - fix test suite. This patch fixes test suite so that it will be able to kill uncooperative Instance Manager. In order to achieve this, test suite needs to know PID of IM Angel process.
385 lines
12 KiB
C++
385 lines
12 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 "options.h"
|
|
|
|
#include "priv.h"
|
|
#include "portability.h"
|
|
#include <my_sys.h>
|
|
#include <my_getopt.h>
|
|
#include <m_string.h>
|
|
#include <mysql_com.h>
|
|
|
|
#define QUOTE2(x) #x
|
|
#define QUOTE(x) QUOTE2(x)
|
|
|
|
#ifdef __WIN__
|
|
char Options::install_as_service;
|
|
char Options::remove_service;
|
|
char Options::stand_alone;
|
|
char windows_config_file[FN_REFLEN];
|
|
char default_password_file_name[FN_REFLEN];
|
|
char default_log_file_name[FN_REFLEN];
|
|
const char *Options::config_file= windows_config_file;
|
|
#else
|
|
char Options::run_as_service;
|
|
const char *Options::user= 0; /* No default value */
|
|
const char *default_password_file_name= QUOTE(DEFAULT_PASSWORD_FILE_NAME);
|
|
const char *default_log_file_name= QUOTE(DEFAULT_LOG_FILE_NAME);
|
|
const char *Options::config_file= QUOTE(DEFAULT_CONFIG_FILE);
|
|
const char *Options::angel_pid_file_name= NULL;
|
|
#endif
|
|
const char *Options::log_file_name= default_log_file_name;
|
|
const char *Options::pid_file_name= QUOTE(DEFAULT_PID_FILE_NAME);
|
|
const char *Options::socket_file_name= QUOTE(DEFAULT_SOCKET_FILE_NAME);
|
|
const char *Options::password_file_name= default_password_file_name;
|
|
const char *Options::default_mysqld_path= QUOTE(DEFAULT_MYSQLD_PATH);
|
|
const char *Options::bind_address= 0; /* No default value */
|
|
uint Options::monitoring_interval= DEFAULT_MONITORING_INTERVAL;
|
|
uint Options::port_number= DEFAULT_PORT;
|
|
/* just to declare */
|
|
char **Options::saved_argv= NULL;
|
|
/* Remember if the config file was forced */
|
|
bool Options::is_forced_default_file= 0;
|
|
|
|
static const char * const ANGEL_PID_FILE_SUFFIX= ".angel.pid";
|
|
static const int ANGEL_PID_FILE_SUFFIX_LEN= strlen(ANGEL_PID_FILE_SUFFIX);
|
|
|
|
/*
|
|
List of options, accepted by the instance manager.
|
|
List must be closed with empty option.
|
|
*/
|
|
|
|
enum options {
|
|
OPT_LOG= 256,
|
|
OPT_PID_FILE,
|
|
OPT_SOCKET,
|
|
OPT_PASSWORD_FILE,
|
|
OPT_MYSQLD_PATH,
|
|
#ifndef __WIN__
|
|
OPT_RUN_AS_SERVICE,
|
|
OPT_USER,
|
|
OPT_ANGEL_PID_FILE,
|
|
#else
|
|
OPT_INSTALL_SERVICE,
|
|
OPT_REMOVE_SERVICE,
|
|
OPT_STAND_ALONE,
|
|
#endif
|
|
OPT_MONITORING_INTERVAL,
|
|
OPT_PORT,
|
|
OPT_WAIT_TIMEOUT,
|
|
OPT_BIND_ADDRESS
|
|
};
|
|
|
|
static struct my_option my_long_options[] =
|
|
{
|
|
{ "help", '?', "Display this help and exit.",
|
|
0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "log", OPT_LOG, "Path to log file. Used only with --run-as-service.",
|
|
(gptr *) &Options::log_file_name, (gptr *) &Options::log_file_name,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "pid-file", OPT_PID_FILE, "Pid file to use.",
|
|
(gptr *) &Options::pid_file_name, (gptr *) &Options::pid_file_name,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
#ifndef __WIN__
|
|
{ "angel-pid-file", OPT_ANGEL_PID_FILE, "Pid file for angel process.",
|
|
(gptr *) &Options::angel_pid_file_name,
|
|
(gptr *) &Options::angel_pid_file_name,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
|
#endif
|
|
|
|
{ "socket", OPT_SOCKET, "Socket file to use for connection.",
|
|
(gptr *) &Options::socket_file_name, (gptr *) &Options::socket_file_name,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "passwd", 'P', "Prepare entry for passwd file and exit.", 0, 0, 0,
|
|
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "bind-address", OPT_BIND_ADDRESS, "Bind address to use for connection.",
|
|
(gptr *) &Options::bind_address, (gptr *) &Options::bind_address,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "port", OPT_PORT, "Port number to use for connections",
|
|
(gptr *) &Options::port_number, (gptr *) &Options::port_number,
|
|
0, GET_UINT, REQUIRED_ARG, DEFAULT_PORT, 0, 0, 0, 0, 0 },
|
|
|
|
{ "password-file", OPT_PASSWORD_FILE, "Look for Instance Manager users"
|
|
" and passwords here.",
|
|
(gptr *) &Options::password_file_name,
|
|
(gptr *) &Options::password_file_name,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "default-mysqld-path", OPT_MYSQLD_PATH, "Where to look for MySQL"
|
|
" Server binary.",
|
|
(gptr *) &Options::default_mysqld_path,
|
|
(gptr *) &Options::default_mysqld_path,
|
|
0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "monitoring-interval", OPT_MONITORING_INTERVAL, "Interval to monitor"
|
|
" instances in seconds.",
|
|
(gptr *) &Options::monitoring_interval,
|
|
(gptr *) &Options::monitoring_interval,
|
|
0, GET_UINT, REQUIRED_ARG, DEFAULT_MONITORING_INTERVAL,
|
|
0, 0, 0, 0, 0 },
|
|
#ifdef __WIN__
|
|
{ "install", OPT_INSTALL_SERVICE, "Install as system service.",
|
|
(gptr *) &Options::install_as_service, (gptr*) &Options::install_as_service,
|
|
0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
|
|
{ "remove", OPT_REMOVE_SERVICE, "Remove system service.",
|
|
(gptr *)&Options::remove_service, (gptr*) &Options::remove_service,
|
|
0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0},
|
|
{ "standalone", OPT_STAND_ALONE, "Run the application in stand alone mode.",
|
|
(gptr *)&Options::stand_alone, (gptr*) &Options::stand_alone,
|
|
0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0},
|
|
#else
|
|
{ "run-as-service", OPT_RUN_AS_SERVICE,
|
|
"Daemonize and start angel process.", (gptr *) &Options::run_as_service,
|
|
0, 0, GET_BOOL, NO_ARG, 0, 0, 1, 0, 0, 0 },
|
|
|
|
{ "user", OPT_USER, "Username to start mysqlmanager",
|
|
(gptr *) &Options::user,
|
|
(gptr *) &Options::user,
|
|
0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
|
|
#endif
|
|
{ "version", 'V', "Output version information and exit.", 0, 0, 0,
|
|
GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 },
|
|
|
|
{ "wait-timeout", OPT_WAIT_TIMEOUT, "The number of seconds IM waits "
|
|
"for activity on a connection before closing it.",
|
|
(gptr *) &net_read_timeout, (gptr *) &net_read_timeout, 0, GET_ULONG,
|
|
REQUIRED_ARG, NET_WAIT_TIMEOUT, 1, LONG_TIMEOUT, 0, 1, 0 },
|
|
|
|
{ 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0 }
|
|
};
|
|
|
|
static void version()
|
|
{
|
|
printf("%s Ver %s for %s on %s\n", my_progname, mysqlmanager_version,
|
|
SYSTEM_TYPE, MACHINE_TYPE);
|
|
}
|
|
|
|
|
|
static const char *default_groups[]= { "manager", 0 };
|
|
|
|
|
|
static void usage()
|
|
{
|
|
version();
|
|
|
|
printf("Copyright (C) 2003, 2004 MySQL AB\n"
|
|
"This software comes with ABSOLUTELY NO WARRANTY. This is free software,\n"
|
|
"and you are welcome to modify and redistribute it under the GPL license\n");
|
|
printf("Usage: %s [OPTIONS] \n", my_progname);
|
|
|
|
my_print_help(my_long_options);
|
|
printf("\nThe following options may be given as the first argument:\n"
|
|
"--print-defaults Print the program argument list and exit\n"
|
|
"--defaults-file=# Only read manager configuration and instance\n"
|
|
" setings from the given file #. The same file\n"
|
|
" will be used to modify configuration of instances\n"
|
|
" with SET commands.\n");
|
|
my_print_variables(my_long_options);
|
|
}
|
|
|
|
|
|
static void passwd()
|
|
{
|
|
char user[1024], *p;
|
|
const char *pw1, *pw2;
|
|
char pw1msg[]= "Enter password: ";
|
|
char pw2msg[]= "Re-type password: ";
|
|
char crypted_pw[SCRAMBLED_PASSWORD_CHAR_LENGTH + 1];
|
|
|
|
fprintf(stderr, "Creating record for new user.\n");
|
|
fprintf(stderr, "Enter user name: ");
|
|
if (!fgets(user, sizeof(user), stdin))
|
|
{
|
|
fprintf(stderr, "Unable to read user.\n");
|
|
return;
|
|
}
|
|
if ((p= strchr(user, '\n'))) *p= 0;
|
|
|
|
pw1= get_tty_password(pw1msg);
|
|
pw2= get_tty_password(pw2msg);
|
|
|
|
if (strcmp(pw1, pw2))
|
|
{
|
|
fprintf(stderr, "Sorry, passwords do not match.\n");
|
|
return;
|
|
}
|
|
|
|
make_scrambled_password(crypted_pw, pw1);
|
|
printf("%s:%s\n", user, crypted_pw);
|
|
}
|
|
|
|
|
|
C_MODE_START
|
|
|
|
static my_bool
|
|
get_one_option(int optid,
|
|
const struct my_option *opt __attribute__((unused)),
|
|
char *argument __attribute__((unused)))
|
|
{
|
|
switch(optid) {
|
|
case 'V':
|
|
version();
|
|
exit(0);
|
|
case 'P':
|
|
passwd();
|
|
exit(0);
|
|
case '?':
|
|
usage();
|
|
exit(0);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
C_MODE_END
|
|
|
|
|
|
/*
|
|
- Process argv of original program: get tid of --defaults-extra-file
|
|
and print a message if met there.
|
|
- call load_defaults to load configuration file section and save the pointer
|
|
for free_defaults.
|
|
- call handle_options to assign defaults and command-line arguments
|
|
to the class members.
|
|
if either of these function fail, return the error code.
|
|
*/
|
|
|
|
int Options::load(int argc, char **argv)
|
|
{
|
|
if (argc >= 2)
|
|
{
|
|
if (is_prefix(argv[1], "--defaults-file="))
|
|
{
|
|
Options::config_file= strchr(argv[1], '=') + 1;
|
|
Options::is_forced_default_file= 1;
|
|
}
|
|
if (is_prefix(argv[1], "--defaults-extra-file=") ||
|
|
is_prefix(argv[1], "--no-defaults"))
|
|
{
|
|
/* the log is not enabled yet */
|
|
fprintf(stderr, "The --defaults-extra-file and --no-defaults options"
|
|
" are not supported by\n"
|
|
"Instance Manager. Program aborted.\n");
|
|
goto err;
|
|
}
|
|
}
|
|
|
|
#ifdef __WIN__
|
|
if (setup_windows_defaults())
|
|
goto err;
|
|
#endif
|
|
/* load_defaults will reset saved_argv with a new allocated list */
|
|
saved_argv= argv;
|
|
|
|
/* config-file options are prepended to command-line ones */
|
|
load_defaults(config_file, default_groups, &argc,
|
|
&saved_argv);
|
|
|
|
if ((handle_options(&argc, &saved_argv, my_long_options,
|
|
get_one_option)) != 0)
|
|
goto err;
|
|
|
|
#ifndef __WIN__
|
|
if (Options::run_as_service)
|
|
{
|
|
if (Options::angel_pid_file_name == NULL)
|
|
{
|
|
/*
|
|
Calculate angel pid file on the IM pid file basis: replace the
|
|
extension (everything after the last dot) of the pid file basename to
|
|
'.angel.pid'.
|
|
*/
|
|
|
|
char *angel_pid_file_name;
|
|
char *base_name_ptr;
|
|
char *ext_ptr;
|
|
|
|
angel_pid_file_name= (char *) malloc(strlen(Options::pid_file_name) +
|
|
ANGEL_PID_FILE_SUFFIX_LEN);
|
|
|
|
strcpy(angel_pid_file_name, Options::pid_file_name);
|
|
|
|
base_name_ptr= strrchr(angel_pid_file_name, '/');
|
|
|
|
if (!base_name_ptr)
|
|
base_name_ptr= angel_pid_file_name + 1;
|
|
|
|
ext_ptr= strrchr(base_name_ptr, '.');
|
|
if (ext_ptr)
|
|
*ext_ptr= 0;
|
|
|
|
strcat(angel_pid_file_name, ANGEL_PID_FILE_SUFFIX);
|
|
|
|
Options::angel_pid_file_name= angel_pid_file_name;
|
|
}
|
|
else
|
|
{
|
|
Options::angel_pid_file_name= strdup(Options::angel_pid_file_name);
|
|
}
|
|
}
|
|
#endif
|
|
|
|
return 0;
|
|
|
|
err:
|
|
return 1;
|
|
}
|
|
|
|
void Options::cleanup()
|
|
{
|
|
/* free_defaults returns nothing */
|
|
if (Options::saved_argv != NULL)
|
|
free_defaults(Options::saved_argv);
|
|
|
|
if (Options::run_as_service)
|
|
free((void *) Options::angel_pid_file_name);
|
|
}
|
|
|
|
#ifdef __WIN__
|
|
|
|
int Options::setup_windows_defaults()
|
|
{
|
|
if (!GetModuleFileName(NULL, default_password_file_name,
|
|
sizeof(default_password_file_name)))
|
|
return 1;
|
|
char *filename= strstr(default_password_file_name, ".exe");
|
|
strcpy(filename, ".passwd");
|
|
|
|
if (!GetModuleFileName(NULL, default_log_file_name,
|
|
sizeof(default_log_file_name)))
|
|
return 1;
|
|
filename= strstr(default_log_file_name, ".exe");
|
|
strcpy(filename, ".log");
|
|
|
|
if (!GetModuleFileName(NULL, windows_config_file,
|
|
sizeof(windows_config_file)))
|
|
return 1;
|
|
char *slash= strrchr(windows_config_file, '\\');
|
|
strcpy(slash, "\\my.ini");
|
|
return 0;
|
|
}
|
|
|
|
#endif
|