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
|
2006-12-23 20:17:15 +01:00
|
|
|
the Free Software Foundation; version 2 of the License.
|
2004-10-23 11:32:52 +04:00
|
|
|
|
|
|
|
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 */
|
|
|
|
|
2005-09-23 21:28:56 +03:00
|
|
|
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
|
2004-10-23 11:32:52 +04:00
|
|
|
#pragma implementation
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "instance_options.h"
|
2005-03-22 02:04:14 +03:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
#include <my_global.h>
|
2004-10-23 11:32:52 +04:00
|
|
|
#include <my_sys.h>
|
|
|
|
#include <m_string.h>
|
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
#include <signal.h>
|
|
|
|
|
|
|
|
#include "buffer.h"
|
|
|
|
#include "instance.h"
|
|
|
|
#include "log.h"
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
#include "options.h"
|
2006-05-18 18:57:50 +04:00
|
|
|
#include "parse_output.h"
|
|
|
|
#include "priv.h"
|
2005-06-01 04:40:22 +04:00
|
|
|
|
|
|
|
|
|
|
|
/* Create "mysqld ..." command in the buffer */
|
|
|
|
|
2006-11-21 17:47:14 +03:00
|
|
|
static inline bool create_mysqld_command(Buffer *buf,
|
2006-05-18 18:57:50 +04:00
|
|
|
const LEX_STRING *mysqld_path,
|
|
|
|
const LEX_STRING *option)
|
2005-06-01 04:40:22 +04:00
|
|
|
{
|
|
|
|
int position= 0;
|
|
|
|
|
|
|
|
if (buf->get_size()) /* malloc succeeded */
|
|
|
|
{
|
2005-09-13 14:53:19 -05:00
|
|
|
#ifdef __WIN__
|
2005-10-31 13:31:06 -05:00
|
|
|
buf->append(position++, "\"", 1);
|
2005-09-13 14:53:19 -05:00
|
|
|
#endif
|
2006-05-18 18:57:50 +04:00
|
|
|
buf->append(position, mysqld_path->str, mysqld_path->length);
|
|
|
|
position+= mysqld_path->length;
|
2005-09-13 14:53:19 -05:00
|
|
|
#ifdef __WIN__
|
2005-10-31 13:31:06 -05:00
|
|
|
buf->append(position++, "\"", 1);
|
2005-09-13 14:53:19 -05:00
|
|
|
#endif
|
2005-06-01 04:40:22 +04:00
|
|
|
/* here the '\0' character is copied from the option string */
|
2006-05-18 18:57:50 +04:00
|
|
|
buf->append(position, option->str, option->length + 1);
|
2005-06-01 04:40:22 +04:00
|
|
|
|
2006-11-21 17:47:14 +03:00
|
|
|
return buf->is_error() ? TRUE : FALSE;
|
2005-06-01 04:40:22 +04:00
|
|
|
}
|
2006-11-21 17:47:14 +03:00
|
|
|
return TRUE;
|
2005-06-01 04:40:22 +04:00
|
|
|
}
|
|
|
|
|
2006-11-22 19:07:05 +03:00
|
|
|
static inline bool is_path_separator(char ch)
|
|
|
|
{
|
|
|
|
#if defined(__WIN__) || defined(__NETWARE__)
|
|
|
|
/* On windows and netware more delimiters are possible */
|
|
|
|
return ch == FN_LIBCHAR || ch == FN_DEVCHAR || ch == '/';
|
|
|
|
#else
|
|
|
|
return ch == FN_LIBCHAR; /* Unixes */
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static char *find_last_path_separator(char *path, uint length)
|
|
|
|
{
|
|
|
|
while (length)
|
|
|
|
{
|
|
|
|
if (is_path_separator(path[length]))
|
|
|
|
return path + length;
|
|
|
|
length--;
|
|
|
|
}
|
|
|
|
return NULL; /* No path separator found */
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-01-25 13:54:56 +03:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
bool Instance_options::is_option_im_specific(const char *option_name)
|
|
|
|
{
|
|
|
|
static const char *IM_SPECIFIC_OPTIONS[] =
|
|
|
|
{
|
|
|
|
"nonguarded",
|
|
|
|
"mysqld-path",
|
|
|
|
"shutdown-delay",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
for (int i= 0; IM_SPECIFIC_OPTIONS[i]; ++i)
|
|
|
|
{
|
|
|
|
if (!strcmp(option_name, IM_SPECIFIC_OPTIONS[i]))
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Instance_options::Instance_options()
|
|
|
|
:mysqld_version(NULL), mysqld_socket(NULL), mysqld_datadir(NULL),
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
mysqld_pid_file(NULL),
|
|
|
|
nonguarded(NULL),
|
|
|
|
mysqld_port(NULL),
|
|
|
|
mysqld_port_val(0),
|
|
|
|
shutdown_delay(NULL),
|
|
|
|
shutdown_delay_val(0),
|
2006-05-18 18:57:50 +04:00
|
|
|
filled_default_options(0)
|
|
|
|
{
|
|
|
|
mysqld_path.str= NULL;
|
|
|
|
mysqld_path.length= 0;
|
|
|
|
|
2006-05-22 15:20:40 +04:00
|
|
|
mysqld_real_path.str= NULL;
|
|
|
|
mysqld_real_path.length= 0;
|
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
memset(logs, 0, sizeof(logs));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-02-11 14:21:59 +03:00
|
|
|
/*
|
|
|
|
Get compiled-in value of default_option
|
|
|
|
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
SYNOPSIS
|
2005-02-11 14:21:59 +03:00
|
|
|
get_default_option()
|
|
|
|
result buffer to put found value
|
|
|
|
result_len buffer size
|
2005-05-16 01:54:02 +04:00
|
|
|
option_name the name of the option, prefixed with "--"
|
2005-02-11 14:21:59 +03:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
|
|
|
Get compile-in value of requested option from server
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 - ok
|
|
|
|
1 - error occured
|
|
|
|
*/
|
|
|
|
|
2005-05-16 01:54:02 +04:00
|
|
|
|
2005-02-11 14:21:59 +03:00
|
|
|
int Instance_options::get_default_option(char *result, size_t result_len,
|
|
|
|
const char *option_name)
|
2005-01-25 13:54:56 +03:00
|
|
|
{
|
2005-02-11 14:21:59 +03:00
|
|
|
int rc= 1;
|
2006-05-18 18:57:50 +04:00
|
|
|
LEX_STRING verbose_option=
|
2006-06-19 15:17:15 +04:00
|
|
|
{ C_STRING_WITH_LEN(" --no-defaults --verbose --help") };
|
2005-01-25 13:54:56 +03:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
/* reserve space for the path + option + final '\0' */
|
|
|
|
Buffer cmd(mysqld_path.length + verbose_option.length + 1);
|
2005-02-11 14:21:59 +03:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
if (create_mysqld_command(&cmd, &mysqld_path, &verbose_option))
|
2005-06-01 04:40:22 +04:00
|
|
|
goto err;
|
|
|
|
|
|
|
|
/* +2 eats first "--" from the option string (E.g. "--datadir") */
|
|
|
|
rc= parse_output_and_get_value(cmd.buffer, option_name + 2,
|
2005-06-07 15:47:02 +04:00
|
|
|
result, result_len, GET_VALUE);
|
2005-06-01 04:40:22 +04:00
|
|
|
err:
|
2005-08-29 23:29:35 +04:00
|
|
|
return rc;
|
2005-06-01 04:40:22 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Fill mysqld_version option (used at initialization stage)
|
|
|
|
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
SYNOPSIS
|
2005-06-01 04:40:22 +04:00
|
|
|
fill_instance_version()
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
|
|
|
Get mysqld version string from "mysqld --version" output.
|
|
|
|
|
|
|
|
RETURN
|
2006-11-21 17:47:14 +03:00
|
|
|
FALSE - ok
|
|
|
|
TRUE - error occured
|
2005-06-01 04:40:22 +04:00
|
|
|
*/
|
|
|
|
|
2006-11-21 17:47:14 +03:00
|
|
|
bool Instance_options::fill_instance_version()
|
2005-06-01 04:40:22 +04:00
|
|
|
{
|
2006-05-18 18:57:50 +04:00
|
|
|
char result[MAX_VERSION_LENGTH];
|
|
|
|
LEX_STRING version_option=
|
2006-06-19 15:17:15 +04:00
|
|
|
{ C_STRING_WITH_LEN(" --no-defaults --version") };
|
2006-05-18 18:57:50 +04:00
|
|
|
Buffer cmd(mysqld_path.length + version_option.length + 1);
|
2005-06-01 04:40:22 +04:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
if (create_mysqld_command(&cmd, &mysqld_path, &version_option))
|
2006-11-21 17:47:14 +03:00
|
|
|
{
|
|
|
|
log_error("Failed to get version of '%s': out of memory.",
|
|
|
|
(const char *) mysqld_path.str);
|
|
|
|
return TRUE;
|
|
|
|
}
|
2005-06-01 04:40:22 +04:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
bzero(result, MAX_VERSION_LENGTH);
|
2005-08-19 17:19:12 +04:00
|
|
|
|
2006-11-21 17:47:14 +03:00
|
|
|
if (parse_output_and_get_value(cmd.buffer, "Ver", result,
|
|
|
|
MAX_VERSION_LENGTH, GET_LINE))
|
|
|
|
{
|
|
|
|
log_error("Failed to get version of '%s': unexpected output.",
|
|
|
|
(const char *) mysqld_path.str);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_ASSERT(*result != '\0');
|
2005-06-01 04:40:22 +04:00
|
|
|
|
|
|
|
{
|
2006-02-10 03:35:07 +03:00
|
|
|
char *start;
|
2005-06-01 04:40:22 +04:00
|
|
|
/* chop the newline from the end of the version string */
|
|
|
|
result[strlen(result) - NEWLINE_LEN]= '\0';
|
2006-02-10 03:35:07 +03:00
|
|
|
/* trim leading whitespaces */
|
|
|
|
start= result;
|
|
|
|
while (my_isspace(default_charset_info, *start))
|
|
|
|
++start;
|
2006-05-18 18:57:50 +04:00
|
|
|
|
2006-02-10 03:35:07 +03:00
|
|
|
mysqld_version= strdup_root(&alloc, start);
|
2005-02-11 14:21:59 +03:00
|
|
|
}
|
2006-11-21 17:47:14 +03:00
|
|
|
|
|
|
|
return FALSE;
|
2006-04-26 12:45:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
Fill mysqld_real_path
|
|
|
|
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
SYNOPSIS
|
2006-04-26 12:45:22 +02:00
|
|
|
fill_mysqld_real_path()
|
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
|
|
|
Get the real path to mysqld from "mysqld --help" output.
|
|
|
|
Will print the realpath of mysqld between "Usage: " and "[OPTIONS]"
|
|
|
|
|
|
|
|
This is needed if the mysqld_path variable is pointing at a
|
|
|
|
script(for example libtool) or a symlink.
|
|
|
|
|
|
|
|
RETURN
|
2006-11-21 17:47:14 +03:00
|
|
|
FALSE - ok
|
|
|
|
TRUE - error occured
|
2006-04-26 12:45:22 +02:00
|
|
|
*/
|
|
|
|
|
2006-11-21 17:47:14 +03:00
|
|
|
bool Instance_options::fill_mysqld_real_path()
|
2006-04-26 12:45:22 +02:00
|
|
|
{
|
|
|
|
char result[FN_REFLEN];
|
2006-05-22 15:20:40 +04:00
|
|
|
LEX_STRING help_option=
|
2006-06-19 15:17:15 +04:00
|
|
|
{ C_STRING_WITH_LEN(" --no-defaults --help") };
|
2006-05-22 15:20:40 +04:00
|
|
|
Buffer cmd(mysqld_path.length + help_option.length);
|
2006-04-26 12:45:22 +02:00
|
|
|
|
2006-05-22 15:20:40 +04:00
|
|
|
if (create_mysqld_command(&cmd, &mysqld_path, &help_option))
|
2006-11-21 17:47:14 +03:00
|
|
|
{
|
|
|
|
log_error("Failed to get real path of '%s': out of memory.",
|
|
|
|
(const char *) mysqld_path.str);
|
|
|
|
return TRUE;
|
|
|
|
}
|
2006-04-26 12:45:22 +02:00
|
|
|
|
|
|
|
bzero(result, FN_REFLEN);
|
|
|
|
|
2006-11-21 17:47:14 +03:00
|
|
|
if (parse_output_and_get_value(cmd.buffer, "Usage: ",
|
2006-04-26 12:45:22 +02:00
|
|
|
result, FN_REFLEN,
|
2006-11-21 17:47:14 +03:00
|
|
|
GET_LINE))
|
|
|
|
{
|
|
|
|
log_error("Failed to get real path of '%s': unexpected output.",
|
|
|
|
(const char *) mysqld_path.str);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
DBUG_ASSERT(*result != '\0');
|
2006-04-26 12:45:22 +02:00
|
|
|
|
|
|
|
{
|
|
|
|
char* options_str;
|
|
|
|
/* chop the path of at [OPTIONS] */
|
|
|
|
if ((options_str= strstr(result, "[OPTIONS]")))
|
|
|
|
*options_str= '\0';
|
2006-05-22 15:20:40 +04:00
|
|
|
mysqld_real_path.str= strdup_root(&alloc, result);
|
|
|
|
mysqld_real_path.length= strlen(mysqld_real_path.str);
|
2006-04-26 12:45:22 +02:00
|
|
|
}
|
2006-11-21 17:47:14 +03:00
|
|
|
|
|
|
|
return FALSE;
|
2005-01-25 13:54:56 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-05-16 01:54:02 +04:00
|
|
|
/*
|
2005-06-01 04:40:22 +04:00
|
|
|
Fill various log options
|
2005-05-16 01:54:02 +04:00
|
|
|
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
SYNOPSIS
|
2005-06-01 04:40:22 +04:00
|
|
|
fill_log_options()
|
2005-05-16 01:54:02 +04:00
|
|
|
|
|
|
|
DESCRIPTION
|
|
|
|
|
2005-06-01 04:40:22 +04:00
|
|
|
Compute paths to enabled log files. If the path is not specified in the
|
|
|
|
instance explicitly (I.e. log=/home/user/mysql.log), we try to guess the
|
|
|
|
file name and placement.
|
2005-05-16 01:54:02 +04:00
|
|
|
|
|
|
|
RETURN
|
2006-11-21 17:47:14 +03:00
|
|
|
FALSE - ok
|
|
|
|
TRUE - error occured
|
2005-05-16 01:54:02 +04:00
|
|
|
*/
|
|
|
|
|
2006-11-21 17:47:14 +03:00
|
|
|
bool Instance_options::fill_log_options()
|
2005-04-09 14:28:39 +04:00
|
|
|
{
|
|
|
|
Buffer buff;
|
2005-05-16 01:54:02 +04:00
|
|
|
enum { MAX_LOG_OPTION_LENGTH= 256 };
|
2005-04-09 14:28:39 +04:00
|
|
|
char datadir[MAX_LOG_OPTION_LENGTH];
|
|
|
|
char hostname[MAX_LOG_OPTION_LENGTH];
|
|
|
|
uint hostname_length;
|
|
|
|
struct log_files_st
|
|
|
|
{
|
|
|
|
const char *name;
|
|
|
|
uint length;
|
2005-05-16 01:54:02 +04:00
|
|
|
char **value;
|
2005-04-09 14:28:39 +04:00
|
|
|
const char *default_suffix;
|
2005-05-16 01:54:02 +04:00
|
|
|
} logs_st[]=
|
2005-04-09 14:28:39 +04:00
|
|
|
{
|
2005-05-18 12:34:38 +02:00
|
|
|
{"--log-error", 11, &(logs[IM_LOG_ERROR]), ".err"},
|
|
|
|
{"--log", 5, &(logs[IM_LOG_GENERAL]), ".log"},
|
|
|
|
{"--log-slow-queries", 18, &(logs[IM_LOG_SLOW]), "-slow.log"},
|
2005-04-09 14:28:39 +04:00
|
|
|
{NULL, 0, NULL, NULL}
|
|
|
|
};
|
|
|
|
struct log_files_st *log_files;
|
|
|
|
|
|
|
|
/* compute hostname and datadir for the instance */
|
|
|
|
if (mysqld_datadir == NULL)
|
|
|
|
{
|
2005-08-29 23:29:35 +04:00
|
|
|
if (get_default_option(datadir, MAX_LOG_OPTION_LENGTH, "--datadir"))
|
2006-11-21 17:47:14 +03:00
|
|
|
return TRUE;
|
2005-04-09 14:28:39 +04:00
|
|
|
}
|
2005-08-29 23:29:35 +04:00
|
|
|
else
|
|
|
|
{
|
|
|
|
/* below is safe, as --datadir always has a value */
|
2006-05-18 18:57:50 +04:00
|
|
|
strmake(datadir, mysqld_datadir, MAX_LOG_OPTION_LENGTH - 1);
|
2005-08-29 23:29:35 +04:00
|
|
|
}
|
2005-04-09 14:28:39 +04:00
|
|
|
|
|
|
|
if (gethostname(hostname,sizeof(hostname)-1) < 0)
|
|
|
|
strmov(hostname, "mysql");
|
|
|
|
|
|
|
|
hostname[MAX_LOG_OPTION_LENGTH - 1]= 0; /* Safety */
|
|
|
|
hostname_length= strlen(hostname);
|
|
|
|
|
|
|
|
|
2005-05-16 01:54:02 +04:00
|
|
|
for (log_files= logs_st; log_files->name; log_files++)
|
2005-04-09 14:28:39 +04:00
|
|
|
{
|
2005-05-16 01:54:02 +04:00
|
|
|
for (int i=0; (argv[i] != 0); i++)
|
2005-04-09 14:28:39 +04:00
|
|
|
{
|
2005-05-16 01:54:02 +04:00
|
|
|
if (!strncmp(argv[i], log_files->name, log_files->length))
|
2005-04-09 14:28:39 +04:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
This is really log_files->name option if and only if it is followed
|
|
|
|
by '=', '\0' or space character. This way we can distinguish such
|
|
|
|
options as '--log' and '--log-bin'. This is checked in the following
|
|
|
|
two statements.
|
|
|
|
*/
|
2005-05-16 01:54:02 +04:00
|
|
|
if (argv[i][log_files->length] == '\0' ||
|
|
|
|
my_isspace(default_charset_info, argv[i][log_files->length]))
|
2005-04-09 14:28:39 +04:00
|
|
|
{
|
|
|
|
char full_name[MAX_LOG_OPTION_LENGTH];
|
|
|
|
|
|
|
|
fn_format(full_name, hostname, datadir, "",
|
|
|
|
MY_UNPACK_FILENAME | MY_SAFE_PATH);
|
|
|
|
|
|
|
|
|
2005-08-29 23:29:35 +04:00
|
|
|
if ((MAX_LOG_OPTION_LENGTH - strlen(full_name)) <=
|
2005-04-09 14:28:39 +04:00
|
|
|
strlen(log_files->default_suffix))
|
2006-11-21 17:47:14 +03:00
|
|
|
return TRUE;
|
2005-04-09 14:28:39 +04:00
|
|
|
|
2005-08-29 23:29:35 +04:00
|
|
|
strmov(full_name + strlen(full_name), log_files->default_suffix);
|
|
|
|
|
2005-05-16 01:54:02 +04:00
|
|
|
/*
|
|
|
|
If there were specified two identical logfiles options,
|
|
|
|
we would loose some memory in MEM_ROOT here. However
|
|
|
|
this situation is not typical.
|
|
|
|
*/
|
|
|
|
*(log_files->value)= strdup_root(&alloc, full_name);
|
2005-04-09 14:28:39 +04:00
|
|
|
}
|
|
|
|
|
2005-05-16 01:54:02 +04:00
|
|
|
if (argv[i][log_files->length] == '=')
|
2005-04-09 14:28:39 +04:00
|
|
|
{
|
|
|
|
char full_name[MAX_LOG_OPTION_LENGTH];
|
|
|
|
|
2005-05-16 01:54:02 +04:00
|
|
|
fn_format(full_name, argv[i] +log_files->length + 1,
|
2005-04-09 14:28:39 +04:00
|
|
|
datadir, "", MY_UNPACK_FILENAME | MY_SAFE_PATH);
|
|
|
|
|
2005-08-29 23:29:35 +04:00
|
|
|
if (!(*(log_files->value)= strdup_root(&alloc, full_name)))
|
2006-11-21 17:47:14 +03:00
|
|
|
return TRUE;
|
2005-04-09 14:28:39 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-11-21 17:47:14 +03:00
|
|
|
return FALSE;
|
2005-04-09 14:28:39 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-05-16 01:54:02 +04:00
|
|
|
/*
|
|
|
|
Get the full pid file name with path
|
|
|
|
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
SYNOPSIS
|
2005-05-16 01:54:02 +04:00
|
|
|
get_pid_filaname()
|
|
|
|
result buffer to sotre the pidfile value
|
|
|
|
|
|
|
|
IMPLEMENTATION
|
|
|
|
Get the data directory, then get the pid filename
|
|
|
|
(which is always set for an instance), then load the
|
|
|
|
full path with my_load_path(). It takes into account
|
|
|
|
whether it is already an absolute path or it should be
|
|
|
|
prefixed with the datadir and so on.
|
|
|
|
|
|
|
|
RETURN
|
|
|
|
0 - ok
|
|
|
|
1 - error occured
|
|
|
|
*/
|
|
|
|
|
2005-02-15 04:38:33 +03:00
|
|
|
int Instance_options::get_pid_filename(char *result)
|
2005-01-25 13:54:56 +03:00
|
|
|
{
|
|
|
|
char datadir[MAX_PATH_LEN];
|
|
|
|
|
2005-08-29 23:29:35 +04:00
|
|
|
if (mysqld_datadir == NULL)
|
2005-02-15 04:38:33 +03:00
|
|
|
{
|
|
|
|
/* we might get an error here if we have wrong path to the mysqld binary */
|
|
|
|
if (get_default_option(datadir, sizeof(datadir), "--datadir"))
|
|
|
|
return 1;
|
|
|
|
}
|
2005-01-25 13:54:56 +03:00
|
|
|
else
|
2006-05-18 18:57:50 +04:00
|
|
|
strxnmov(datadir, MAX_PATH_LEN - 1, mysqld_datadir, "/", NullS);
|
2005-01-25 13:54:56 +03:00
|
|
|
|
|
|
|
/* get the full path to the pidfile */
|
2006-05-18 18:57:50 +04:00
|
|
|
my_load_path(result, mysqld_pid_file, datadir);
|
2005-02-15 04:38:33 +03:00
|
|
|
return 0;
|
2005-01-25 13:54:56 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
int Instance_options::unlink_pidfile()
|
|
|
|
{
|
2005-02-11 14:21:59 +03:00
|
|
|
return unlink(pid_file_with_path);
|
2005-01-25 13:54:56 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
pid_t Instance_options::load_pid()
|
2005-01-25 13:54:56 +03:00
|
|
|
{
|
2005-02-11 14:21:59 +03:00
|
|
|
FILE *pid_file_stream;
|
2005-01-25 13:54:56 +03:00
|
|
|
|
|
|
|
/* get the pid */
|
2005-02-13 15:13:33 +03:00
|
|
|
if ((pid_file_stream= my_fopen(pid_file_with_path,
|
|
|
|
O_RDONLY | O_BINARY, MYF(0))) != NULL)
|
2005-01-25 13:54:56 +03:00
|
|
|
{
|
|
|
|
pid_t pid;
|
|
|
|
|
2006-09-25 09:28:52 +02:00
|
|
|
if (fscanf(pid_file_stream, "%i", &pid) != 1)
|
|
|
|
pid= -1;
|
2005-01-25 13:54:56 +03:00
|
|
|
my_fclose(pid_file_stream, MYF(0));
|
|
|
|
return pid;
|
|
|
|
}
|
2005-08-29 23:29:35 +04:00
|
|
|
return 0;
|
2005-01-25 13:54:56 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
bool Instance_options::complete_initialization()
|
2004-10-23 11:32:52 +04:00
|
|
|
{
|
2006-05-18 23:34:35 +04:00
|
|
|
int arg_idx;
|
2005-01-25 13:54:56 +03:00
|
|
|
const char *tmp;
|
2005-11-02 09:30:01 -06:00
|
|
|
char *end;
|
2006-11-22 19:07:05 +03:00
|
|
|
char bin_name_firstchar;
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2006-06-23 14:59:40 +02:00
|
|
|
if (!mysqld_path.str)
|
2006-06-23 14:50:02 +02:00
|
|
|
{
|
2006-11-22 19:07:05 +03:00
|
|
|
/*
|
|
|
|
Need to copy the path to allocated memory, as convert_dirname() might
|
|
|
|
need to change it
|
|
|
|
*/
|
2006-11-23 18:26:56 +03:00
|
|
|
mysqld_path.str=
|
|
|
|
alloc_root(&alloc, strlen(Options::Main::default_mysqld_path) + 1);
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
|
2006-11-23 18:26:56 +03:00
|
|
|
if (!mysqld_path.str)
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
return TRUE;
|
|
|
|
|
|
|
|
strcpy(mysqld_path.str, Options::Main::default_mysqld_path);
|
2006-06-23 14:50:02 +02:00
|
|
|
}
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
mysqld_path.length= strlen(mysqld_path.str);
|
2005-06-01 04:40:22 +04:00
|
|
|
|
2006-11-22 19:07:05 +03:00
|
|
|
/*
|
|
|
|
If we found path with no slashes (end == NULL), we should not call
|
|
|
|
convert_dirname() at all. As we have got relative path to the binary.
|
|
|
|
That is, user supposes that mysqld resides in the same dir as
|
|
|
|
mysqlmanager.
|
|
|
|
*/
|
|
|
|
if ((end= find_last_path_separator(mysqld_path.str, mysqld_path.length)))
|
|
|
|
{
|
|
|
|
bin_name_firstchar= end[1];
|
|
|
|
|
|
|
|
/*
|
|
|
|
Below we will conver the path to mysqld in the case, it was given
|
|
|
|
in a format of another OS (e.g. uses '/' instead of '\' etc).
|
|
|
|
Here we strip the path to get rid of the binary name ("mysqld"),
|
|
|
|
we do it by removing first letter of the binary name (e.g. 'm'
|
|
|
|
in "mysqld"). Later we put it back.
|
|
|
|
*/
|
|
|
|
end[1]= 0;
|
|
|
|
|
|
|
|
/* convert dirname to the format of current OS */
|
|
|
|
convert_dirname((char*)mysqld_path.str, mysqld_path.str, NullS);
|
|
|
|
|
|
|
|
/* put back the first character of the binary name*/
|
|
|
|
end[1]= bin_name_firstchar;
|
|
|
|
}
|
|
|
|
|
2005-02-27 18:41:34 +03:00
|
|
|
if (mysqld_port)
|
2006-05-18 18:57:50 +04:00
|
|
|
mysqld_port_val= atoi(mysqld_port);
|
2005-02-27 18:41:34 +03:00
|
|
|
|
|
|
|
if (shutdown_delay)
|
|
|
|
shutdown_delay_val= atoi(shutdown_delay);
|
|
|
|
|
2005-01-25 13:54:56 +03:00
|
|
|
if (!(tmp= strdup_root(&alloc, "--no-defaults")))
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
return TRUE;
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
if (!mysqld_pid_file)
|
2004-10-23 11:32:52 +04:00
|
|
|
{
|
2005-01-25 13:54:56 +03:00
|
|
|
char pidfilename[MAX_PATH_LEN];
|
|
|
|
char hostname[MAX_PATH_LEN];
|
2005-02-18 14:58:30 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
If we created only one istance [mysqld], because no config. files were
|
|
|
|
found, we would like to model mysqld pid file values.
|
|
|
|
*/
|
2006-05-18 18:57:50 +04:00
|
|
|
|
2005-01-25 13:54:56 +03:00
|
|
|
if (!gethostname(hostname, sizeof(hostname) - 1))
|
2005-06-07 15:47:02 +04:00
|
|
|
{
|
2006-05-18 18:57:50 +04:00
|
|
|
if (Instance::is_mysqld_compatible_name(&instance_name))
|
|
|
|
strxnmov(pidfilename, MAX_PATH_LEN - 1, hostname, ".pid", NullS);
|
2005-06-07 17:57:20 +04:00
|
|
|
else
|
2006-05-18 18:57:50 +04:00
|
|
|
strxnmov(pidfilename, MAX_PATH_LEN - 1, instance_name.str, "-",
|
|
|
|
hostname, ".pid", NullS);
|
2005-06-07 15:47:02 +04:00
|
|
|
}
|
2005-01-25 13:54:56 +03:00
|
|
|
else
|
2005-06-07 15:47:02 +04:00
|
|
|
{
|
2006-05-18 18:57:50 +04:00
|
|
|
if (Instance::is_mysqld_compatible_name(&instance_name))
|
|
|
|
strxnmov(pidfilename, MAX_PATH_LEN - 1, "mysql", ".pid", NullS);
|
2005-06-07 15:47:02 +04:00
|
|
|
else
|
2006-05-18 18:57:50 +04:00
|
|
|
strxnmov(pidfilename, MAX_PATH_LEN - 1, instance_name.str, ".pid",
|
|
|
|
NullS);
|
2005-06-07 15:47:02 +04:00
|
|
|
}
|
2005-01-25 13:54:56 +03:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
Named_value option((char *) "pid-file", pidfilename);
|
|
|
|
|
|
|
|
set_option(&option);
|
2004-10-23 11:32:52 +04:00
|
|
|
}
|
|
|
|
|
2005-02-15 04:38:33 +03:00
|
|
|
if (get_pid_filename(pid_file_with_path))
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
return TRUE;
|
2005-02-11 14:21:59 +03:00
|
|
|
|
2005-01-25 13:54:56 +03:00
|
|
|
/* we need to reserve space for the final zero + possible default options */
|
2005-08-29 23:29:35 +04:00
|
|
|
if (!(argv= (char**)
|
2006-05-18 18:57:50 +04:00
|
|
|
alloc_root(&alloc, (get_num_options() + 1
|
2005-08-29 23:29:35 +04:00
|
|
|
+ MAX_NUMBER_OF_DEFAULT_OPTIONS) * sizeof(char*))))
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
return TRUE;
|
2006-05-18 18:57:50 +04:00
|
|
|
filled_default_options= 0;
|
2005-01-25 13:54:56 +03:00
|
|
|
|
|
|
|
/* the path must be first in the argv */
|
2006-05-18 18:57:50 +04:00
|
|
|
if (add_to_argv(mysqld_path.str))
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
return TRUE;
|
2005-01-25 13:54:56 +03:00
|
|
|
|
|
|
|
if (add_to_argv(tmp))
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
return TRUE;
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2006-05-18 23:34:35 +04:00
|
|
|
arg_idx= filled_default_options;
|
2006-05-18 18:57:50 +04:00
|
|
|
for (int opt_idx= 0; opt_idx < get_num_options(); ++opt_idx)
|
|
|
|
{
|
|
|
|
char option_str[MAX_OPTION_STR_LEN];
|
|
|
|
Named_value option= get_option(opt_idx);
|
|
|
|
|
|
|
|
if (is_option_im_specific(option.get_name()))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
char *ptr= strxnmov(option_str, MAX_OPTION_LEN + 3, "--", option.get_name(),
|
|
|
|
NullS);
|
|
|
|
|
|
|
|
if (option.get_value()[0])
|
|
|
|
strxnmov(ptr, MAX_OPTION_LEN + 2, "=", option.get_value(), NullS);
|
|
|
|
|
|
|
|
argv[arg_idx++]= strdup_root(&alloc, option_str);
|
|
|
|
}
|
|
|
|
|
|
|
|
argv[arg_idx]= 0;
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2006-04-26 12:45:22 +02:00
|
|
|
if (fill_log_options() || fill_mysqld_real_path() || fill_instance_version())
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
return TRUE;
|
2004-10-23 11:32:52 +04:00
|
|
|
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
return FALSE;
|
2004-10-23 11:32:52 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
bool Instance_options::set_option(Named_value *option)
|
|
|
|
{
|
|
|
|
bool err_status;
|
|
|
|
int idx= find_option(option->get_name());
|
|
|
|
char *option_name_str;
|
|
|
|
char *option_value_str;
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
if (!(option_name_str= Named_value::alloc_str(option->get_name())))
|
|
|
|
return TRUE;
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
if (!(option_value_str= Named_value::alloc_str(option->get_value())))
|
|
|
|
{
|
|
|
|
Named_value::free_str(&option_name_str);
|
|
|
|
return TRUE;
|
|
|
|
}
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
Named_value option_copy(option_name_str, option_value_str);
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
if (idx < 0)
|
|
|
|
err_status= options.add_element(&option_copy);
|
|
|
|
else
|
|
|
|
err_status= options.replace_element(idx, &option_copy);
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
if (!err_status)
|
|
|
|
update_var(option_copy.get_name(), option_copy.get_value());
|
|
|
|
else
|
|
|
|
option_copy.free();
|
|
|
|
|
|
|
|
return err_status;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Instance_options::unset_option(const char *option_name)
|
2004-10-23 11:32:52 +04:00
|
|
|
{
|
2006-05-18 18:57:50 +04:00
|
|
|
int idx= find_option(option_name);
|
|
|
|
|
|
|
|
if (idx < 0)
|
|
|
|
return; /* the option has not been set. */
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
options.remove_element(idx);
|
|
|
|
|
|
|
|
update_var(option_name, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void Instance_options::update_var(const char *option_name,
|
|
|
|
const char *option_value)
|
2004-10-23 11:32:52 +04:00
|
|
|
{
|
2006-05-18 18:57:50 +04:00
|
|
|
struct options_st
|
2004-10-23 11:32:52 +04:00
|
|
|
{
|
2004-11-02 10:11:03 +03:00
|
|
|
const char *name;
|
2006-05-18 18:57:50 +04:00
|
|
|
uint name_len;
|
|
|
|
const char **var;
|
|
|
|
} options_def[]=
|
2004-10-23 11:32:52 +04:00
|
|
|
{
|
2006-05-18 18:57:50 +04:00
|
|
|
{"socket", 6, &mysqld_socket},
|
|
|
|
{"port", 4, &mysqld_port},
|
|
|
|
{"datadir", 7, &mysqld_datadir},
|
|
|
|
{"pid-file", 8, &mysqld_pid_file},
|
|
|
|
{"nonguarded", 10, &nonguarded},
|
|
|
|
{"mysqld-path", 11, (const char **) &mysqld_path.str},
|
|
|
|
{"shutdown-delay", 14, &shutdown_delay},
|
|
|
|
{NULL, 0, NULL}
|
2004-11-02 10:11:03 +03:00
|
|
|
};
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
for (options_st *opt= options_def; opt->name; ++opt)
|
|
|
|
{
|
|
|
|
if (!strncmp(opt->name, option_name, opt->name_len))
|
|
|
|
{
|
|
|
|
*(opt->var)= option_value;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2005-02-05 10:15:34 +03:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
int Instance_options::find_option(const char *option_name)
|
|
|
|
{
|
|
|
|
for (int i= 0; i < get_num_options(); i++)
|
|
|
|
{
|
|
|
|
if (!strcmp(get_option(i).get_name(), option_name))
|
|
|
|
return i;
|
|
|
|
}
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
return -1;
|
2004-10-23 11:32:52 +04:00
|
|
|
}
|
|
|
|
|
2004-11-02 10:11:03 +03:00
|
|
|
|
2004-10-23 11:32:52 +04:00
|
|
|
int Instance_options::add_to_argv(const char* option)
|
|
|
|
{
|
2004-10-25 14:23:31 +04:00
|
|
|
DBUG_ASSERT(filled_default_options < MAX_NUMBER_OF_DEFAULT_OPTIONS);
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2005-08-29 23:29:35 +04:00
|
|
|
if (option)
|
2005-05-16 01:54:02 +04:00
|
|
|
argv[filled_default_options++]= (char*) option;
|
2004-10-23 11:32:52 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-02-11 14:21:59 +03:00
|
|
|
|
|
|
|
/* function for debug purposes */
|
2005-02-03 20:48:58 +03:00
|
|
|
void Instance_options::print_argv()
|
|
|
|
{
|
|
|
|
int i;
|
2006-05-18 18:57:50 +04:00
|
|
|
|
|
|
|
printf("printing out an instance %s argv:\n",
|
|
|
|
(const char *) instance_name.str);
|
|
|
|
|
2005-02-03 20:48:58 +03:00
|
|
|
for (i=0; argv[i] != NULL; i++)
|
|
|
|
printf("argv: %s\n", argv[i]);
|
|
|
|
}
|
|
|
|
|
2004-10-23 11:32:52 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
We execute this function to initialize some options.
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
|
|
|
|
RETURN
|
|
|
|
FALSE - ok
|
|
|
|
TRUE - memory allocation error
|
2004-10-23 11:32:52 +04:00
|
|
|
*/
|
|
|
|
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
bool Instance_options::init(const LEX_STRING *instance_name_arg)
|
2004-10-23 11:32:52 +04:00
|
|
|
{
|
2006-05-18 18:57:50 +04:00
|
|
|
instance_name.length= instance_name_arg->length;
|
2004-10-23 11:32:52 +04:00
|
|
|
|
|
|
|
init_alloc_root(&alloc, MEM_ROOT_BLOCK_SIZE, 0);
|
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
if (options.init())
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
return TRUE;
|
2004-10-23 11:32:52 +04:00
|
|
|
|
2006-05-18 18:57:50 +04:00
|
|
|
if (!(instance_name.str= strmake_root(&alloc, instance_name_arg->str,
|
|
|
|
instance_name_arg->length)))
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
return TRUE;
|
2004-10-23 11:32:52 +04:00
|
|
|
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
return FALSE;
|
2004-10-23 11:32:52 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Instance_options::~Instance_options()
|
|
|
|
{
|
|
|
|
free_root(&alloc, MYF(0));
|
|
|
|
}
|
Port cleanups, trivial refactoring and code rearrangements from
Alik's patch for BUG#22306: STOP INSTANCE can not be applied for
instances in Crashed, Failed and Abandoned" to ease review process.
Evaluate global variable linuxthreads before starting threads to avoid
a race.
server-tools/instance-manager/buffer.cc:
Fix spelling.
server-tools/instance-manager/command.h:
Fix spelling.
server-tools/instance-manager/commands.cc:
Fix spelling.
server-tools/instance-manager/commands.h:
Fix spelling, tidy up.
server-tools/instance-manager/guardian.cc:
Cleanup logging, options.get_shutdown_delay() is a method, tidy up.
server-tools/instance-manager/instance.cc:
Rearrange methods to be the same as in Alik's patch, fix spelling errors,
clean up logging texts, port comments from Alik's patch,
implement some basic renames from his patch.
No real changes.
server-tools/instance-manager/instance.h:
Tidy up, renames.
server-tools/instance-manager/instance_map.cc:
Fix spellings, port some refactoring from Alik's patch.
server-tools/instance-manager/instance_map.h:
Cleanup.
server-tools/instance-manager/instance_options.cc:
Cleanup. Implement Instance_options::get_shutdown_delay() and
Instance_options::get_mysqld_port().
server-tools/instance-manager/instance_options.h:
Cleanup.
server-tools/instance-manager/listener.cc:
Cleanup.
server-tools/instance-manager/log.cc:
Fix spelling.
server-tools/instance-manager/manager.cc:
Cleanup.
server-tools/instance-manager/manager.h:
Add getters for Manager members.
server-tools/instance-manager/mysqlmanager.cc:
Evaluate linuxthreads before starting threads to avoid a race.
server-tools/instance-manager/parse_output.cc:
Fix spelling.
server-tools/instance-manager/priv.cc:
Cleanup.
server-tools/instance-manager/priv.h:
Cleanup.
server-tools/instance-manager/user_management_commands.cc:
Fix spelling.
server-tools/instance-manager/user_management_commands.h:
Fix spelling.
server-tools/instance-manager/user_map.cc:
Fix spelling.
2006-11-18 01:34:44 +03:00
|
|
|
|
|
|
|
|
|
|
|
uint Instance_options::get_shutdown_delay() const
|
|
|
|
{
|
|
|
|
static const uint DEFAULT_SHUTDOWN_DELAY= 35;
|
|
|
|
|
|
|
|
/*
|
|
|
|
NOTE: it is important to check shutdown_delay here, but use
|
|
|
|
shutdown_delay_val. The idea is that if the option is unset,
|
|
|
|
shutdown_delay will be NULL, but shutdown_delay_val will not be reset.
|
|
|
|
*/
|
|
|
|
|
|
|
|
return shutdown_delay ? shutdown_delay_val : DEFAULT_SHUTDOWN_DELAY;
|
|
|
|
}
|
|
|
|
|
|
|
|
int Instance_options::get_mysqld_port() const
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
NOTE: it is important to check mysqld_port here, but use mysqld_port_val.
|
|
|
|
The idea is that if the option is unset, mysqld_port will be NULL, but
|
|
|
|
mysqld_port_val will not be reset.
|
|
|
|
*/
|
|
|
|
|
|
|
|
return mysqld_port ? mysqld_port_val : 0;
|
|
|
|
}
|
|
|
|
|