mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +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.
228 lines
8.4 KiB
Text
228 lines
8.4 KiB
Text
###########################################################################
|
|
#
|
|
# This test suite checks the following statements:
|
|
# - CREATE INSTANCE <instance_name> [option1[=option1_value], ...];
|
|
# - DROP INSTANCE <instance_name>;
|
|
#
|
|
# For CREATE INSTANCE we check that:
|
|
# - CREATE INSTANCE succeeds for non-existing instance;
|
|
# - CREATE INSTANCE fails for existing instance;
|
|
# - CREATE INSTANCE can get additional options with and w/o values;
|
|
# - CREATE INSTANCE parses options and handles grammar errors correctly.
|
|
# Check that strings with spaces are handled correctly, unknown (for
|
|
# mysqld) options should also be handled;
|
|
# - CREATE INSTANCE updates both config file and internal configuration cache;
|
|
# - CREATE INSTANCE allows to create instances only with properly formed
|
|
# names (mysqld*);
|
|
#
|
|
# For DROP INSTANCE we check that:
|
|
# - DROP INSTANCE succeeds for existing instance;
|
|
# - DROP INSTANCE fails for non-existing instance;
|
|
# - DROP INSTANCE fails for active instance.
|
|
# - DROP INSTANCE updates both config file and internal configuration cache;
|
|
#
|
|
###########################################################################
|
|
|
|
--source include/im_check_os.inc
|
|
|
|
###########################################################################
|
|
#
|
|
# Check starting conditions.
|
|
#
|
|
###########################################################################
|
|
|
|
# Check that the configuration file contains only instances that we expect.
|
|
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep server_id $MYSQLTEST_VARDIR/im.cnf;
|
|
--echo --------------------------------------------------------------------
|
|
|
|
# Check that mysqld1 is reported as running.
|
|
|
|
--sleep 3
|
|
# should be longer than monitoring interval and enough to start instance.
|
|
|
|
SHOW INSTANCES;
|
|
|
|
# Check that the expected mysqld instance is actually run (check that we can
|
|
# connect and execute something).
|
|
|
|
--echo
|
|
--echo ---> connection: mysql1_con
|
|
--connect (mysql1_con,localhost,root,,mysql,$IM_MYSQLD1_PORT,$IM_MYSQLD1_SOCK)
|
|
--connection mysql1_con
|
|
|
|
SHOW VARIABLES LIKE 'server_id';
|
|
|
|
--disconnect mysql1_con
|
|
|
|
--echo
|
|
--echo ---> connection: default
|
|
--connection default
|
|
|
|
###########################################################################
|
|
#
|
|
# CREATE INSTANCE tests.
|
|
#
|
|
###########################################################################
|
|
|
|
# Check that CREATE INSTANCE succeeds for non-existing instance and also check
|
|
# that both config file and internal configuration cache have been updated.
|
|
|
|
CREATE INSTANCE mysqld3;
|
|
|
|
SHOW INSTANCES;
|
|
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep server_id $MYSQLTEST_VARDIR/im.cnf ;
|
|
--echo --------------------------------------------------------------------
|
|
|
|
# Check that CREATE INSTANCE fails for existing instance. Let's all three
|
|
# existing instances (running one, stopped one and just created one). Just in
|
|
# case...
|
|
|
|
--error 3012 # ER_CREATE_EXISTING_INSTANCE
|
|
CREATE INSTANCE mysqld1;
|
|
|
|
--error 3012 # ER_CREATE_EXISTING_INSTANCE
|
|
CREATE INSTANCE mysqld2;
|
|
|
|
--error 3012 # ER_CREATE_EXISTING_INSTANCE
|
|
CREATE INSTANCE mysqld3;
|
|
|
|
# Check that CREATE INSTANCE can get additional options with and w/o values.
|
|
# Ensure that config file is updated properly.
|
|
|
|
# - without values;
|
|
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep nonguarded $MYSQLTEST_VARDIR/im.cnf;
|
|
--echo --------------------------------------------------------------------
|
|
|
|
CREATE INSTANCE mysqld4 nonguarded;
|
|
|
|
SHOW INSTANCES;
|
|
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep nonguarded $MYSQLTEST_VARDIR/im.cnf;
|
|
--echo --------------------------------------------------------------------
|
|
|
|
# - with value;
|
|
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-A $MYSQLTEST_VARDIR/im.cnf || true;
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-B $MYSQLTEST_VARDIR/im.cnf || true;
|
|
--echo --------------------------------------------------------------------
|
|
|
|
CREATE INSTANCE mysqld5 test-A = 000, test-B = test;
|
|
|
|
SHOW INSTANCES;
|
|
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-A $MYSQLTEST_VARDIR/im.cnf;
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-B $MYSQLTEST_VARDIR/im.cnf;
|
|
--echo --------------------------------------------------------------------
|
|
|
|
# Check that CREATE INSTANCE parses options and handles grammar errors
|
|
# correctly. Check that strings with spaces are handled correctly,
|
|
# unknown (for mysqld) options should also be handled.
|
|
|
|
# - check handling of extra spaces;
|
|
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-C $MYSQLTEST_VARDIR/im.cnf || true;
|
|
--echo --------------------------------------------------------------------
|
|
|
|
CREATE INSTANCE mysqld6 test-C1 = 10 , test-C2 = 02 ;
|
|
|
|
SHOW INSTANCES;
|
|
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-C1 $MYSQLTEST_VARDIR/im.cnf;
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-C2 $MYSQLTEST_VARDIR/im.cnf;
|
|
--echo --------------------------------------------------------------------
|
|
|
|
# - check handling of grammar error;
|
|
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-D $MYSQLTEST_VARDIR/im.cnf || true;
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-E $MYSQLTEST_VARDIR/im.cnf || true;
|
|
--echo --------------------------------------------------------------------
|
|
|
|
--error ER_SYNTAX_ERROR
|
|
CREATE INSTANCE mysqld7 test-D = test-D-value ;
|
|
SHOW INSTANCES;
|
|
|
|
--error ER_SYNTAX_ERROR
|
|
CREATE INSTANCE mysqld8 test-E 0 ;
|
|
SHOW INSTANCES;
|
|
|
|
--error ER_SYNTAX_ERROR
|
|
CREATE INSTANCE mysqld8 test-F = ;
|
|
SHOW INSTANCES;
|
|
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-D $MYSQLTEST_VARDIR/im.cnf || true;
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-E $MYSQLTEST_VARDIR/im.cnf || true;
|
|
--echo --------------------------------------------------------------------
|
|
|
|
# - check parsing of string option values
|
|
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-1 $MYSQLTEST_VARDIR/im.cnf || true;
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-2 $MYSQLTEST_VARDIR/im.cnf || true;
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-3 $MYSQLTEST_VARDIR/im.cnf || true;
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-4 $MYSQLTEST_VARDIR/im.cnf || true;
|
|
--echo --------------------------------------------------------------------
|
|
|
|
CREATE INSTANCE mysqld9 test-1=" hello world ", test-2=' ';
|
|
SHOW INSTANCES;
|
|
|
|
CREATE INSTANCE mysqld9a test-3='\b\babc\sdef';
|
|
# test-3='abc def'
|
|
SHOW INSTANCES;
|
|
|
|
CREATE INSTANCE mysqld9b test-4='abc\tdef', test-5='abc\ndef';
|
|
SHOW INSTANCES;
|
|
|
|
CREATE INSTANCE mysqld9c test-6="abc\rdef", test-7="abc\\def";
|
|
# test-6=abc
|
|
SHOW INSTANCES;
|
|
|
|
--error ER_SYNTAX_ERROR
|
|
CREATE INSTANCE mysqld10 test-bad=' \ ';
|
|
SHOW INSTANCES;
|
|
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-1 $MYSQLTEST_VARDIR/im.cnf;
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-2 $MYSQLTEST_VARDIR/im.cnf;
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-3 $MYSQLTEST_VARDIR/im.cnf;
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-4 $MYSQLTEST_VARDIR/im.cnf;
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-5 $MYSQLTEST_VARDIR/im.cnf;
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-6 $MYSQLTEST_VARDIR/im.cnf;
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-7 $MYSQLTEST_VARDIR/im.cnf;
|
|
--echo --------------------------------------------------------------------
|
|
--exec grep test-bad $MYSQLTEST_VARDIR/im.cnf || true;
|
|
--echo --------------------------------------------------------------------
|
|
|
|
|
|
# Check that CREATE INSTANCE allows to create instances only with properly
|
|
# formed names (mysqld*).
|
|
|
|
--error 3014 # ER_MALFORMED_INSTANCE_NAME
|
|
CREATE INSTANCE qqq1;
|
|
|