mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 14:54:20 +01:00
23776f53ff
- BUG#22306: STOP INSTANCE can not be applied for instances in Crashed, Failed and Abandoned; - BUG#23476: DROP INSTANCE does not work - BUG#23215: STOP INSTANCE takes too much time BUG#22306: The problem was that STOP INSTANCE checked that mysqld is up and running. If it was not so, STOP INSTANCE reported an error. Now, STOP INSTANCE reports an error if the instance has been started (mysqld can be down). BUG#23476: The problem was that DROP INSTANCE tried to stop inactive instance. The fix is trivial. BUG#23215: The problem was that locks were not acquired properly, so the instance-monitoring thread could not acquire the mutex, holded by the query-processing thread. The fix is to simplify locking scheme by moving instance-related information to Instance-class out of Guardian-class. This allows to get rid of storing a separate list of Instance-information in Guardian and keeping it synchronized with the original list in Instance_map. server-tools/instance-manager/commands.cc: 1. Introduce Instance_cmd class -- base class for the commands that deal with the one instance; 2. Remove Instance_map argument from command constructors; 3. Ensure, that Instance Map and Instance are locked in the proper order; 4. Polishing. server-tools/instance-manager/commands.h: 1. Introduce Instance_cmd class -- base class for the commands that deal with the one instance; 2. Remove Instance_map argument from command constructors; 3. Polishing. server-tools/instance-manager/guardian.cc: 1. Move "extended" instance information to the Instance-class. That allows to get rid of storing instance-related container and data in Guardian class, that significantly simplifies locking schema. 2. Polishing. server-tools/instance-manager/guardian.h: 1. Move "extended" instance information to the Instance-class. That allows to get rid of storing instance-related container and data in Guardian class, that significantly simplifies locking schema. 2. Polishing. server-tools/instance-manager/instance.cc: 1. Move "extended" instance information to the Instance-class. 2. Introduce new state STOPPED to mark that guarded instance is stopped and should not be restarted by Guardian. 3. Polishing. server-tools/instance-manager/instance.h: 1. Move "extended" instance information to the Instance-class. 2. Introduce new state STOPPED to mark that guarded instance is stopped and should not be restarted by Guardian. 3. Polishing. server-tools/instance-manager/instance_map.cc: 1. Move flush_instances() from Instance_map to Manager. 2. Polishing. server-tools/instance-manager/instance_map.h: 1. Move flush_instances() from Instance_map to Manager. 2. Polishing. server-tools/instance-manager/instance_options.h: Polishing. server-tools/instance-manager/manager.cc: 1. Move flush_instances() from Instance_map to Manager. 2. Polishing. server-tools/instance-manager/manager.h: 1. Move flush_instances() from Instance_map to Manager. 2. Polishing. server-tools/instance-manager/user_map.cc: Polishing.
127 lines
3.6 KiB
C++
127 lines
3.6 KiB
C++
#ifndef INCLUDES_MYSQL_INSTANCE_MANAGER_INSTANCE_OPTIONS_H
|
|
#define INCLUDES_MYSQL_INSTANCE_MANAGER_INSTANCE_OPTIONS_H
|
|
/* 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 */
|
|
|
|
#include <my_global.h>
|
|
#include <my_sys.h>
|
|
|
|
#include "parse.h"
|
|
#include "portability.h" /* for pid_t on Win32 */
|
|
|
|
#if defined(__GNUC__) && defined(USE_PRAGMA_INTERFACE)
|
|
#pragma interface
|
|
#endif
|
|
|
|
|
|
/*
|
|
This class contains options of an instance and methods to operate them.
|
|
|
|
We do not provide this class with the means of synchronization as it is
|
|
supposed that options for instances are all loaded at once during the
|
|
instance_map initilization and we do not change them later. This way we
|
|
don't have to synchronize between threads.
|
|
*/
|
|
|
|
class Instance_options
|
|
{
|
|
public:
|
|
/* The operation is used to check if the option is IM-specific or not. */
|
|
static bool is_option_im_specific(const char *option_name);
|
|
|
|
public:
|
|
Instance_options();
|
|
~Instance_options();
|
|
|
|
bool complete_initialization();
|
|
|
|
bool set_option(Named_value *option);
|
|
void unset_option(const char *option_name);
|
|
|
|
inline int get_num_options() const;
|
|
inline Named_value get_option(int idx) const;
|
|
|
|
public:
|
|
bool init(const LEX_STRING *instance_name_arg);
|
|
pid_t load_pid();
|
|
int get_pid_filename(char *result);
|
|
int unlink_pidfile();
|
|
void print_argv();
|
|
|
|
uint get_shutdown_delay() const;
|
|
int get_mysqld_port() const;
|
|
|
|
public:
|
|
/*
|
|
We need this value to be greater or equal then FN_REFLEN found in
|
|
my_global.h to use my_load_path()
|
|
*/
|
|
enum { MAX_PATH_LEN= 512 };
|
|
enum { MAX_NUMBER_OF_DEFAULT_OPTIONS= 2 };
|
|
char pid_file_with_path[MAX_PATH_LEN];
|
|
char **argv;
|
|
/*
|
|
Here we cache the version string, obtained from mysqld --version.
|
|
In the case when mysqld binary is not found we get NULL here.
|
|
*/
|
|
const char *mysqld_version;
|
|
/* We need the some options, so we store them as a separate pointers */
|
|
const char *mysqld_socket;
|
|
const char *mysqld_datadir;
|
|
const char *mysqld_pid_file;
|
|
LEX_STRING instance_name;
|
|
LEX_STRING mysqld_path;
|
|
LEX_STRING mysqld_real_path;
|
|
const char *nonguarded;
|
|
/* log enums are defined in parse.h */
|
|
char *logs[3];
|
|
|
|
private:
|
|
bool fill_log_options();
|
|
bool fill_instance_version();
|
|
bool fill_mysqld_real_path();
|
|
int add_to_argv(const char *option);
|
|
int get_default_option(char *result, size_t result_len,
|
|
const char *option_name);
|
|
|
|
void update_var(const char *option_name, const char *option_value);
|
|
int find_option(const char *option_name);
|
|
|
|
private:
|
|
const char *mysqld_port;
|
|
uint mysqld_port_val;
|
|
const char *shutdown_delay;
|
|
uint shutdown_delay_val;
|
|
|
|
uint filled_default_options;
|
|
MEM_ROOT alloc;
|
|
|
|
Named_value_arr options;
|
|
};
|
|
|
|
|
|
inline int Instance_options::get_num_options() const
|
|
{
|
|
return options.get_size();
|
|
}
|
|
|
|
|
|
inline Named_value Instance_options::get_option(int idx) const
|
|
{
|
|
return options.get_element(idx);
|
|
}
|
|
|
|
#endif /* INCLUDES_MYSQL_INSTANCE_MANAGER_INSTANCE_OPTIONS_H */
|