mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
8b4fcf6e3b
- WL#3158: IM: Instance configuration extensions; - WL#3159: IM: --bootstrap and --start-default-instance modes The following new statements have been added: - CREATE INSTANCE; - DROP INSTANCE; The behaviour of the following statements have been changed: - SET; - UNSET; - FLUSH INSTANCES; - SHOW INSTANCES; - SHOW INSTANCE OPTIONS; BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833: Delete: mysql-test/t/im_options_set.imtest BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921: Delete: mysql-test/r/im_options_set.result BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048: Delete: mysql-test/t/im_options_unset.imtest BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f: Delete: mysql-test/r/im_options_unset.result client/get_password.c: Change prototype to avoid casting when using C-strings (char *). include/m_string.h: Moved LEX_STRING to global header from sql/ to be accessible from all components (IM for one). include/my_sys.h: Added constants for modify_defaults_file(). include/mysql_com.h: Removed duplicated declarations. my_sys.h should be used instead. libmysql/get_password.c: Change prototype to avoid casting when using C-strings (char *). mysql-test/mysql-test-run.pl: Added environment variables to be used from tests. mysql-test/r/im_daemon_life_cycle.result: Column name has been changed in SHOW INSTANCES. mysql-test/r/im_life_cycle.result: 1. Column name has been changed in SHOW INSTANCES. 2. Removed redundant SHOW INSTANCE STATUS statements. mysql-test/r/im_utils.result: Updated the result file. mysql-test/t/im_daemon_life_cycle-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_daemon_life_cycle.imtest: Get Instance Manager and managed mysqld-instances enough time to start. mysql-test/t/im_life_cycle.imtest: 1. Polishing; 2. Fixed a test error in 1.1.2. mysql-test/t/im_utils.imtest: Get Instance Manager and managed mysqld-instances enough time to start. mysys/default.c: Pass the name of the section to the handler function as well. mysys/default_modify.c: Added REMOVE_SECTION functionality. server-tools/instance-manager/IMService.cpp: Polishing: be more verbose. server-tools/instance-manager/IMService.h: Polishing: added copyright. server-tools/instance-manager/Makefile.am: Added new files. server-tools/instance-manager/WindowsService.cpp: Polishing: according to The Coding Style, TRUE/FALSE must be used instead of true/false. server-tools/instance-manager/WindowsService.h: Polishing: added copyright. server-tools/instance-manager/command.h: Polishing: provide a comment for the main operation of "Command" class. server-tools/instance-manager/commands.cc: 1. Added support for CREATE INSTANCE, DROP INSTANCE statements; 2. Added "deprecated" column in output of SHOW INSTANCE OPTIONS; 3. Modified the behaviour of SET/UNSET, FLUSH INSTANCES statements; server-tools/instance-manager/commands.h: 1. Added support for CREATE INSTANCE, DROP INSTANCE statements; 2. Added "deprecated" column in output of SHOW INSTANCE OPTIONS; 3. Modified the behaviour of SET/UNSET, FLUSH INSTANCES statements; server-tools/instance-manager/guardian.cc: Added operations to retrieve state of managed instances. server-tools/instance-manager/guardian.h: Added operations to retrieve state of managed instances. server-tools/instance-manager/instance.cc: 1. Provided an operation to check validity of instance name. 2. Added an attribute to distiguish mysqld-instances, whose configuration should be kept backward-compatible. server-tools/instance-manager/instance.h: 1. Provided an operation to check validity of instance name. 2. Added an attribute to distiguish mysqld-instances, whose configuration should be kept backward-compatible. server-tools/instance-manager/instance_map.cc: 1. Used the operation to check validity of instance name; 2. Added operations to manage instances. server-tools/instance-manager/instance_map.h: Added operations to manage instances. server-tools/instance-manager/instance_options.cc: Changed Instance_options so that it will be possible to manage options on the fly. server-tools/instance-manager/instance_options.h: Changed Instance_options so that it will be possible to manage options on the fly. server-tools/instance-manager/listener.cc: 1. Remove reference to the instance of Options; 2. Use new Options naming scheme. server-tools/instance-manager/listener.h: Remove reference to the instance of Options; server-tools/instance-manager/log.cc: Polishing: use TRUE/FALSE instead of true/false. server-tools/instance-manager/manager.cc: Added a common for IM operation to work with configuration file. server-tools/instance-manager/manager.h: Added a common for IM operation to work with configuration file. server-tools/instance-manager/messages.cc: Added messages for new errors. server-tools/instance-manager/mysql_connection.cc: 1. Move a constant to common place. 2. Polishing. server-tools/instance-manager/mysql_manager_error.h: Added new errors. server-tools/instance-manager/mysqlmanager.cc: 1. Use error code from Options::load(); 2. Eliminate type-casting warning on Windows. server-tools/instance-manager/options.cc: Added support for user-management command-line options. server-tools/instance-manager/options.h: Added support for user-management command-line options. server-tools/instance-manager/parse.cc: 1. Added support of new statements: - CREATE INSTANCE; - DROP INSTANCE. 2. Modified SET/UNSET. server-tools/instance-manager/parse.h: 1. Added support of new statements: - CREATE INSTANCE; - DROP INSTANCE. 2. Modified SET/UNSET. server-tools/instance-manager/parse_output.cc: Sorted out header files. server-tools/instance-manager/parse_output.h: Sorted out header files. server-tools/instance-manager/portability.h: 1. Added constants for Windows. 2. Moved system-dependent defines from instance_options.cc. server-tools/instance-manager/priv.cc: Updated version. server-tools/instance-manager/priv.h: Added some global constants. server-tools/instance-manager/protocol.cc: Replaced NAME_WITH_LENGTH by LEX_STRING. server-tools/instance-manager/protocol.h: Replaced NAME_WITH_LENGTH by LEX_STRING. server-tools/instance-manager/thread_registry.cc: Polishing: use TRUE/FALSE instead of true/false. server-tools/instance-manager/user_map.cc: Added support for managing password database. server-tools/instance-manager/user_map.h: Added support for managing password database. sql/sp.cc: Replaced LEX_STRING_WITH_INIT by LEX_STRING + struct initialization. sql/sp_head.cc: Replaced LEX_STRING_WITH_INIT by LEX_STRING + struct initialization. sql/spatial.cc: Removed LEX_STRING_WITH_INIT. sql/spatial.h: Removed LEX_STRING_WITH_INIT. sql/sql_string.h: Moved STRING_WITH_LEN() macro out from sql (to m_string.h). sql/sql_trigger.cc: Moved STRING_WITH_LEN() macro out from sql (to m_string.h). sql/structs.h: Removed LEX_STRING_WITH_INIT. support-files/mysql.server.sh: Instruct Instance Manager to work in mysqld-safe compatible mode for backward compatibility. mysql-test/r/im_cmd_line.result: Added result file. mysql-test/r/im_instance_conf.result: Added result file. mysql-test/r/im_options.result: Added result file. mysql-test/t/im_cmd_line.imtest: IM command-line options test. mysql-test/t/im_instance_conf-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_instance_conf.imtest: Added a new test case for checking instance-management. mysql-test/t/im_life_cycle-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_options.imtest: Join im_options_set and im_options_unset and add new tests. mysql-test/t/im_utils-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. server-tools/instance-manager/exit_codes.h: New file for defining exit codes for user-management mode. server-tools/instance-manager/user_management_commands.cc: User-management commands implementation. server-tools/instance-manager/user_management_commands.h: User-management command declarations.
256 lines
8.2 KiB
C
256 lines
8.2 KiB
C
/* Copyright (C) 2005 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 "mysys_priv.h"
|
|
#include "m_string.h"
|
|
#include <my_dir.h>
|
|
|
|
#define BUFF_SIZE 1024
|
|
#define RESERVE 1024 /* Extend buffer with this extent */
|
|
|
|
#ifdef __WIN__
|
|
#define NEWLINE "\r\n"
|
|
#define NEWLINE_LEN 2
|
|
#else
|
|
#define NEWLINE "\n"
|
|
#define NEWLINE_LEN 1
|
|
#endif
|
|
|
|
static char *add_option(char *dst, const char *option_value,
|
|
const char *option, int remove_option);
|
|
|
|
|
|
/*
|
|
Add/remove option to the option file section.
|
|
|
|
SYNOPSYS
|
|
modify_defaults_file()
|
|
file_location The location of configuration file to edit
|
|
option The name of the option to look for (can be NULL)
|
|
option value The value of the option we would like to set (can be NULL)
|
|
section_name The name of the section (must be NOT NULL)
|
|
remove_option This defines what we want to remove:
|
|
- MY_REMOVE_NONE -- nothing to remove;
|
|
- MY_REMOVE_OPTION -- remove the specified option;
|
|
- MY_REMOVE_SECTION -- remove the specified section;
|
|
IMPLEMENTATION
|
|
We open the option file first, then read the file line-by-line,
|
|
looking for the section we need. At the same time we put these lines
|
|
into a buffer. Then we look for the option within this section and
|
|
change/remove it. In the end we get a buffer with modified version of the
|
|
file. Then we write it to the file, truncate it if needed and close it.
|
|
Note that there is a small time gap, when the file is incomplete,
|
|
and this theoretically might introduce a problem.
|
|
|
|
RETURN
|
|
0 - ok
|
|
1 - some error has occured. Probably due to the lack of resourses
|
|
2 - cannot open the file
|
|
*/
|
|
|
|
int modify_defaults_file(const char *file_location, const char *option,
|
|
const char *option_value,
|
|
const char *section_name, int remove_option)
|
|
{
|
|
FILE *cnf_file;
|
|
MY_STAT file_stat;
|
|
char linebuff[BUFF_SIZE], *src_ptr, *dst_ptr, *file_buffer;
|
|
uint opt_len= 0;
|
|
uint optval_len= 0;
|
|
uint sect_len, nr_newlines= 0, buffer_size;
|
|
my_bool in_section= FALSE, opt_applied= 0;
|
|
uint reserve_extended;
|
|
uint new_opt_len;
|
|
int reserve_occupied= 0;
|
|
DBUG_ENTER("modify_defaults_file");
|
|
|
|
if (!(cnf_file= my_fopen(file_location, O_RDWR | O_BINARY, MYF(0))))
|
|
DBUG_RETURN(2);
|
|
|
|
/* my_fstat doesn't use the flag parameter */
|
|
if (my_fstat(fileno(cnf_file), &file_stat, MYF(0)))
|
|
goto malloc_err;
|
|
|
|
if (option && option_value)
|
|
{
|
|
opt_len= (uint) strlen(option);
|
|
optval_len= (uint) strlen(option_value);
|
|
}
|
|
|
|
new_opt_len= opt_len + 1 + optval_len + NEWLINE_LEN;
|
|
|
|
/* calculate the size of the buffer we need */
|
|
reserve_extended= (opt_len +
|
|
1 + /* For '=' char */
|
|
optval_len + /* Option value len */
|
|
NEWLINE_LEN + /* Space for newline */
|
|
RESERVE); /* Some additional space */
|
|
|
|
buffer_size= (file_stat.st_size +
|
|
1); /* The ending zero */
|
|
|
|
/*
|
|
Reserve space to read the contents of the file and some more
|
|
for the option we want to add.
|
|
*/
|
|
if (!(file_buffer= (char*) my_malloc(buffer_size + reserve_extended,
|
|
MYF(MY_WME))))
|
|
goto malloc_err;
|
|
|
|
sect_len= (uint) strlen(section_name);
|
|
|
|
for (dst_ptr= file_buffer; fgets(linebuff, BUFF_SIZE, cnf_file); )
|
|
{
|
|
/* Skip over whitespaces */
|
|
for (src_ptr= linebuff; my_isspace(&my_charset_latin1, *src_ptr);
|
|
src_ptr++)
|
|
{}
|
|
|
|
if (!*src_ptr) /* Empty line */
|
|
{
|
|
nr_newlines++;
|
|
continue;
|
|
}
|
|
|
|
/* correct the option (if requested) */
|
|
if (option && in_section && !strncmp(src_ptr, option, opt_len) &&
|
|
(*(src_ptr + opt_len) == '=' ||
|
|
my_isspace(&my_charset_latin1, *(src_ptr + opt_len)) ||
|
|
*(src_ptr + opt_len) == '\0'))
|
|
{
|
|
char *old_src_ptr= src_ptr;
|
|
src_ptr= strend(src_ptr+ opt_len); /* Find the end of the line */
|
|
|
|
/* could be negative */
|
|
reserve_occupied+= (int) new_opt_len - (int) (src_ptr - old_src_ptr);
|
|
if (reserve_occupied >= (int) reserve_extended)
|
|
{
|
|
reserve_extended= (uint) reserve_occupied + RESERVE;
|
|
if (!(file_buffer= (char*) my_realloc(file_buffer, buffer_size +
|
|
reserve_extended,
|
|
MYF(MY_WME|MY_FREE_ON_ERROR))))
|
|
goto malloc_err;
|
|
}
|
|
opt_applied= 1;
|
|
dst_ptr= add_option(dst_ptr, option_value, option, remove_option);
|
|
}
|
|
else
|
|
{
|
|
/*
|
|
If we are going to the new group and have an option to apply, do
|
|
it now. If we are removing a single option or the whole section
|
|
this will only trigger opt_applied flag.
|
|
*/
|
|
|
|
if (in_section && !opt_applied && *src_ptr == '[')
|
|
{
|
|
dst_ptr= add_option(dst_ptr, option_value, option, remove_option);
|
|
opt_applied= 1; /* set the flag to do write() later */
|
|
reserve_occupied= new_opt_len+ opt_len + 1 + NEWLINE_LEN;
|
|
}
|
|
|
|
for (; nr_newlines; nr_newlines--)
|
|
dst_ptr= strmov(dst_ptr, NEWLINE);
|
|
|
|
/* Skip the section if MY_REMOVE_SECTION was given */
|
|
if (!in_section || remove_option != MY_REMOVE_SECTION)
|
|
dst_ptr= strmov(dst_ptr, linebuff);
|
|
}
|
|
/* Look for a section */
|
|
if (*src_ptr == '[')
|
|
{
|
|
/* Copy the line to the buffer */
|
|
if (!strncmp(++src_ptr, section_name, sect_len))
|
|
{
|
|
src_ptr+= sect_len;
|
|
/* Skip over whitespaces. They are allowed after section name */
|
|
for (; my_isspace(&my_charset_latin1, *src_ptr); src_ptr++)
|
|
{}
|
|
|
|
if (*src_ptr != ']')
|
|
{
|
|
in_section= FALSE;
|
|
continue; /* Missing closing parenthesis. Assume this was no group */
|
|
}
|
|
|
|
if (remove_option == MY_REMOVE_SECTION)
|
|
dst_ptr= dst_ptr - strlen(linebuff);
|
|
|
|
in_section= TRUE;
|
|
}
|
|
else
|
|
in_section= FALSE; /* mark that this section is of no interest to us */
|
|
}
|
|
}
|
|
|
|
/*
|
|
File ended. Apply an option or set opt_applied flag (in case of
|
|
MY_REMOVE_SECTION) so that the changes are saved. Do not do anything
|
|
if we are removing non-existent option.
|
|
*/
|
|
|
|
if (!opt_applied && in_section && (remove_option != MY_REMOVE_OPTION))
|
|
{
|
|
/* New option still remains to apply at the end */
|
|
if (!remove_option && *(dst_ptr - 1) != '\n')
|
|
dst_ptr= strmov(dst_ptr, NEWLINE);
|
|
dst_ptr= add_option(dst_ptr, option_value, option, remove_option);
|
|
opt_applied= 1;
|
|
}
|
|
for (; nr_newlines; nr_newlines--)
|
|
dst_ptr= strmov(dst_ptr, NEWLINE);
|
|
|
|
if (opt_applied)
|
|
{
|
|
/* Don't write the file if there are no changes to be made */
|
|
if (my_chsize(fileno(cnf_file), (my_off_t) (dst_ptr - file_buffer), 0,
|
|
MYF(MY_WME)) ||
|
|
my_fseek(cnf_file, 0, MY_SEEK_SET, MYF(0)) ||
|
|
my_fwrite(cnf_file, file_buffer, (uint) (dst_ptr - file_buffer),
|
|
MYF(MY_NABP)))
|
|
goto err;
|
|
}
|
|
if (my_fclose(cnf_file, MYF(MY_WME)))
|
|
DBUG_RETURN(1);
|
|
|
|
my_free(file_buffer, MYF(0));
|
|
DBUG_RETURN(0);
|
|
|
|
err:
|
|
my_free(file_buffer, MYF(0));
|
|
malloc_err:
|
|
my_fclose(cnf_file, MYF(0));
|
|
DBUG_RETURN(1); /* out of resources */
|
|
}
|
|
|
|
|
|
static char *add_option(char *dst, const char *option_value,
|
|
const char *option, int remove_option)
|
|
{
|
|
if (!remove_option)
|
|
{
|
|
dst= strmov(dst, option);
|
|
if (*option_value)
|
|
{
|
|
*dst++= '=';
|
|
dst= strmov(dst, option_value);
|
|
}
|
|
/* add a newline */
|
|
dst= strmov(dst, NEWLINE);
|
|
}
|
|
return dst;
|
|
}
|