mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +01:00
f4d209b015
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.
mysql-test/lib/mtr_process.pl:
Added a function to send a signal to a process.
mysql-test/mysql-test-run.pl:
Changed procedure of stopping Instance Manager.
1. Try to stop IM normally (by sending SIGTERM);
2. If one of IM-related processes is still alive,
kill them all by SIGKILL and complain in the log.
server-tools/instance-manager/manager.cc:
Made create_pid_file() available for the whole project.
server-tools/instance-manager/manager.h:
Made create_pid_file() available for the whole project.
server-tools/instance-manager/mysqlmanager.cc:
Dump PID of angel process into file.
server-tools/instance-manager/options.cc:
Added an option to allow to customize angel pid file name.
server-tools/instance-manager/options.h:
Added an option to allow to customize angel pid file name.
62 lines
2 KiB
C
62 lines
2 KiB
C
#ifndef INCLUDES_MYSQL_INSTANCE_MANAGER_OPTIONS_H
|
|
#define INCLUDES_MYSQL_INSTANCE_MANAGER_OPTIONS_H
|
|
/* 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 */
|
|
|
|
/*
|
|
Options - all possible options for the instance manager grouped in one
|
|
struct.
|
|
*/
|
|
#include <my_global.h>
|
|
|
|
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
|
#pragma interface
|
|
#endif
|
|
|
|
struct Options
|
|
{
|
|
#ifdef __WIN__
|
|
static char install_as_service;
|
|
static char remove_service;
|
|
static char stand_alone;
|
|
#else
|
|
static char run_as_service; /* handle_options doesn't support bool */
|
|
static const char *user;
|
|
static const char *angel_pid_file_name;
|
|
#endif
|
|
static bool is_forced_default_file;
|
|
static const char *log_file_name;
|
|
static const char *pid_file_name;
|
|
static const char *socket_file_name;
|
|
static const char *password_file_name;
|
|
static const char *default_mysqld_path;
|
|
/* the option which should be passed to process_default_option_files */
|
|
static uint monitoring_interval;
|
|
static uint port_number;
|
|
static const char *bind_address;
|
|
static const char *config_file;
|
|
|
|
/* argv pointer returned by load_defaults() to be used by free_defaults() */
|
|
static char **saved_argv;
|
|
|
|
int load(int argc, char **argv);
|
|
void cleanup();
|
|
#ifdef __WIN__
|
|
int setup_windows_defaults();
|
|
#endif
|
|
};
|
|
|
|
#endif // INCLUDES_MYSQL_INSTANCE_MANAGER_OPTIONS_H
|