mirror of
https://github.com/MariaDB/server.git
synced 2025-08-30 11:22:14 +03:00
- 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.
170 lines
4.3 KiB
C++
170 lines
4.3 KiB
C++
/* Copyright (C) 2003 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include "log.h"
|
|
|
|
#include <my_global.h>
|
|
#include <m_string.h>
|
|
#include <my_sys.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
/*
|
|
TODO:
|
|
- add flexible header support
|
|
- rewrite all fprintf with fwrite
|
|
- think about using 'write' instead of fwrite/fprintf on POSIX systems
|
|
*/
|
|
|
|
/*
|
|
Format log entry and write it to the given stream.
|
|
SYNOPSYS
|
|
log()
|
|
*/
|
|
|
|
static inline void log(FILE *file, const char *format, va_list args)
|
|
{
|
|
/*
|
|
log() should be thread-safe; it implies that we either call fprintf()
|
|
once per log(), or use flockfile()/funlockfile(). But flockfile() is
|
|
POSIX, not ANSI C, so we try to vsnprintf the whole message to the
|
|
stack, and if stack buffer is not enough, to malloced string. When
|
|
message is formatted, it is fprintf()'ed to the file.
|
|
*/
|
|
|
|
/* Format time like MYSQL_LOG does. */
|
|
time_t now= time(0);
|
|
struct tm bd_time; // broken-down time
|
|
localtime_r(&now, &bd_time);
|
|
|
|
char buff_date[32];
|
|
sprintf(buff_date, "%02d%02d%02d %2d:%02d:%02d\t",
|
|
bd_time.tm_year % 100,
|
|
bd_time.tm_mon + 1,
|
|
bd_time.tm_mday,
|
|
bd_time.tm_hour,
|
|
bd_time.tm_min,
|
|
bd_time.tm_sec);
|
|
/* Format the message */
|
|
char buff_stack[256];
|
|
|
|
int n= vsnprintf(buff_stack, sizeof(buff_stack), format, args);
|
|
/*
|
|
return value of vsnprintf can vary, according to various standards;
|
|
try to check all cases.
|
|
*/
|
|
char *buff_msg= buff_stack;
|
|
if (n < 0 || n == sizeof(buff_stack))
|
|
{
|
|
int size= sizeof(buff_stack) * 2;
|
|
buff_msg= (char*) my_malloc(size, MYF(0));
|
|
while (TRUE)
|
|
{
|
|
if (buff_msg == 0)
|
|
{
|
|
strmake(buff_stack, "log(): message is too big, my_malloc() failed",
|
|
sizeof(buff_stack) - 1);
|
|
buff_msg= buff_stack;
|
|
break;
|
|
}
|
|
n = vsnprintf(buff_msg, size, format, args);
|
|
if (n >= 0 && n < size)
|
|
break;
|
|
size*= 2;
|
|
/* realloc() does unnecessary memcpy */
|
|
my_free(buff_msg, 0);
|
|
buff_msg= (char*) my_malloc(size, MYF(0));
|
|
}
|
|
}
|
|
else if ((size_t) n > sizeof(buff_stack))
|
|
{
|
|
buff_msg= (char*) my_malloc(n + 1, MYF(0));
|
|
#ifdef DBUG
|
|
DBUG_ASSERT(n == vsnprintf(buff_msg, n + 1, format, args));
|
|
#else
|
|
vsnprintf(buff_msg, n + 1, format, args);
|
|
#endif
|
|
}
|
|
fprintf(file, "%s%s\n", buff_date, buff_msg);
|
|
if (buff_msg != buff_stack)
|
|
my_free(buff_msg, 0);
|
|
|
|
/* don't fflush() the file: buffering strategy is set in log_init() */
|
|
}
|
|
|
|
|
|
void log_error(const char *format, ...)
|
|
{
|
|
va_list args;
|
|
va_start(args, format);
|
|
log(stderr, format, args);
|
|
va_end(args);
|
|
}
|
|
|
|
|
|
void log_info(const char *format, ...)
|
|
{
|
|
va_list args;
|
|
va_start(args, format);
|
|
log(stdout, format, args);
|
|
va_end(args);
|
|
}
|
|
|
|
/* TODO: rewrite with buffering print */
|
|
void print_info(const char *format, ...)
|
|
{
|
|
va_list args;
|
|
va_start(args, format);
|
|
vfprintf(stdout, format, args);
|
|
va_end(args);
|
|
}
|
|
|
|
void print_error(const char *format, ...)
|
|
{
|
|
va_list args;
|
|
va_start(args, format);
|
|
vfprintf(stderr, format, args);
|
|
va_end(args);
|
|
}
|
|
|
|
/*
|
|
log_init()
|
|
RETURN VALUE
|
|
0 ok
|
|
!0 error
|
|
*/
|
|
|
|
void log_init()
|
|
{
|
|
/*
|
|
stderr is unbuffered by default; there is no good of line buffering,
|
|
as all logging is performed linewise - so remove buffering from stdout
|
|
also
|
|
*/
|
|
setbuf(stdout, 0);
|
|
}
|
|
|
|
void die(const char *format, ...)
|
|
{
|
|
va_list args;
|
|
fprintf(stderr,"%s: ", my_progname);
|
|
va_start(args, format);
|
|
vfprintf(stderr, format, args);
|
|
va_end(args);
|
|
fprintf(stderr, "\n");
|
|
exit(1);
|
|
}
|