mirror of
https://github.com/MariaDB/server.git
synced 2025-01-22 06:44:16 +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.
386 lines
11 KiB
C++
386 lines
11 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 */
|
|
|
|
#if defined(__GNUC__) && defined(USE_PRAGMA_IMPLEMENTATION)
|
|
#pragma implementation
|
|
#endif
|
|
|
|
#include "mysql_connection.h"
|
|
|
|
#include <m_string.h>
|
|
#include <m_string.h>
|
|
#include <my_global.h>
|
|
#include <mysql_com.h>
|
|
#include <mysql.h>
|
|
#include <my_sys.h>
|
|
#include <violite.h>
|
|
|
|
#include "command.h"
|
|
#include "log.h"
|
|
#include "messages.h"
|
|
#include "mysqld_error.h"
|
|
#include "mysql_manager_error.h"
|
|
#include "parse.h"
|
|
#include "priv.h"
|
|
#include "protocol.h"
|
|
#include "thread_registry.h"
|
|
#include "user_map.h"
|
|
|
|
|
|
Mysql_connection_thread_args::Mysql_connection_thread_args(
|
|
struct st_vio *vio_arg,
|
|
Thread_registry &thread_registry_arg,
|
|
const User_map &user_map_arg,
|
|
ulong connection_id_arg,
|
|
Instance_map &instance_map_arg) :
|
|
vio(vio_arg)
|
|
,thread_registry(thread_registry_arg)
|
|
,user_map(user_map_arg)
|
|
,connection_id(connection_id_arg)
|
|
,instance_map(instance_map_arg)
|
|
{}
|
|
|
|
/*
|
|
MySQL connection - handle one connection with mysql command line client
|
|
See also comments in mysqlmanager.cc to picture general Instance Manager
|
|
architecture.
|
|
We use conventional technique to work with classes without exceptions:
|
|
class acquires all vital resource in init(); Thus if init() succeed,
|
|
a user must call cleanup(). All other methods are valid only between
|
|
init() and cleanup().
|
|
*/
|
|
|
|
class Mysql_connection_thread: public Mysql_connection_thread_args
|
|
{
|
|
public:
|
|
Mysql_connection_thread(const Mysql_connection_thread_args &args);
|
|
|
|
int init();
|
|
void cleanup();
|
|
|
|
void run();
|
|
|
|
~Mysql_connection_thread();
|
|
private:
|
|
Thread_info thread_info;
|
|
NET net;
|
|
struct rand_struct rand_st;
|
|
char scramble[SCRAMBLE_LENGTH + 1];
|
|
uint status;
|
|
ulong client_capabilities;
|
|
private:
|
|
/* Names are conventionally the same as in mysqld */
|
|
int check_connection();
|
|
int do_command();
|
|
int dispatch_command(enum enum_server_command command,
|
|
const char *text, uint len);
|
|
};
|
|
|
|
|
|
Mysql_connection_thread::Mysql_connection_thread(
|
|
const Mysql_connection_thread_args &args) :
|
|
Mysql_connection_thread_args(args.vio,
|
|
args.thread_registry,
|
|
args.user_map,
|
|
args.connection_id,
|
|
args.instance_map)
|
|
,thread_info(pthread_self())
|
|
{
|
|
thread_registry.register_thread(&thread_info);
|
|
}
|
|
|
|
|
|
/*
|
|
NET subsystem requieres its user to provide my_net_local_init extern
|
|
C function (exactly as declared below). my_net_local_init is called by
|
|
my_net_init and is supposed to set NET controlling variables.
|
|
See also priv.h for variables description.
|
|
*/
|
|
|
|
C_MODE_START
|
|
|
|
void my_net_local_init(NET *net)
|
|
{
|
|
net->max_packet= net_buffer_length;
|
|
net->read_timeout= net_read_timeout;
|
|
net->write_timeout= net_write_timeout;
|
|
net->retry_count= net_retry_count;
|
|
net->max_packet_size= max_allowed_packet;
|
|
}
|
|
|
|
C_MODE_END
|
|
|
|
|
|
/*
|
|
Every resource, which we can fail to acquire, is allocated in init().
|
|
This function is complementary to cleanup().
|
|
*/
|
|
|
|
int Mysql_connection_thread::init()
|
|
{
|
|
/* Allocate buffers for network I/O */
|
|
if (my_net_init(&net, vio))
|
|
return 1;
|
|
net.return_status= &status;
|
|
/* Initialize random number generator */
|
|
{
|
|
ulong seed1= (ulong) &rand_st + rand();
|
|
ulong seed2= (ulong) rand() + time(0);
|
|
randominit(&rand_st, seed1, seed2);
|
|
}
|
|
/* Fill scramble - server's random message used for handshake */
|
|
create_random_string(scramble, SCRAMBLE_LENGTH, &rand_st);
|
|
/* We don't support transactions, every query is atomic */
|
|
status= SERVER_STATUS_AUTOCOMMIT;
|
|
return 0;
|
|
}
|
|
|
|
|
|
void Mysql_connection_thread::cleanup()
|
|
{
|
|
net_end(&net);
|
|
}
|
|
|
|
|
|
Mysql_connection_thread::~Mysql_connection_thread()
|
|
{
|
|
/* vio_delete closes the socket if necessary */
|
|
vio_delete(vio);
|
|
thread_registry.unregister_thread(&thread_info);
|
|
}
|
|
|
|
|
|
void Mysql_connection_thread::run()
|
|
{
|
|
log_info("accepted mysql connection %d", connection_id);
|
|
|
|
my_thread_init();
|
|
|
|
if (check_connection())
|
|
{
|
|
my_thread_end();
|
|
return;
|
|
}
|
|
|
|
log_info("connection %d is checked successfully", connection_id);
|
|
|
|
vio_keepalive(vio, TRUE);
|
|
|
|
while (!net.error && net.vio && !thread_registry.is_shutdown())
|
|
{
|
|
if (do_command())
|
|
break;
|
|
}
|
|
|
|
my_thread_end();
|
|
}
|
|
|
|
|
|
int Mysql_connection_thread::check_connection()
|
|
{
|
|
ulong pkt_len=0; // to hold client reply length
|
|
|
|
/* buffer for the first packet */ /* packet contains: */
|
|
char buff[MAX_VERSION_LENGTH + 1 + // server version, 0-ended
|
|
4 + // connection id
|
|
SCRAMBLE_LENGTH + 2 + // scramble (in 2 pieces)
|
|
18]; // server variables: flags,
|
|
// charset number, status,
|
|
char *pos= buff;
|
|
ulong server_flags;
|
|
|
|
memcpy(pos, mysqlmanager_version.str, mysqlmanager_version.length + 1);
|
|
pos+= mysqlmanager_version.length + 1;
|
|
|
|
int4store((uchar*) pos, connection_id);
|
|
pos+= 4;
|
|
|
|
/*
|
|
Old clients does not understand long scrambles, but can ignore packet
|
|
tail: that's why first part of the scramble is placed here, and second
|
|
part at the end of packet (even though we don't support old clients,
|
|
we must follow standard packet format.)
|
|
*/
|
|
memcpy(pos, scramble, SCRAMBLE_LENGTH_323);
|
|
pos+= SCRAMBLE_LENGTH_323;
|
|
*pos++= '\0';
|
|
|
|
server_flags= CLIENT_LONG_FLAG | CLIENT_PROTOCOL_41 |
|
|
CLIENT_SECURE_CONNECTION;
|
|
|
|
/*
|
|
18-bytes long section for various flags/variables
|
|
|
|
Every flag occupies a bit in first half of ulong; int2store will
|
|
gracefully pick up all flags.
|
|
*/
|
|
int2store(pos, server_flags);
|
|
pos+= 2;
|
|
*pos++= (char) default_charset_info->number; // global mysys variable
|
|
int2store(pos, status); // connection status
|
|
pos+= 2;
|
|
bzero(pos, 13); // not used now
|
|
pos+= 13;
|
|
|
|
/* second part of the scramble, null-terminated */
|
|
memcpy(pos, scramble + SCRAMBLE_LENGTH_323,
|
|
SCRAMBLE_LENGTH - SCRAMBLE_LENGTH_323 + 1);
|
|
pos+= SCRAMBLE_LENGTH - SCRAMBLE_LENGTH_323 + 1;
|
|
|
|
/* write connection message and read reply */
|
|
enum { MIN_HANDSHAKE_SIZE= 2 };
|
|
if (net_write_command(&net, protocol_version, "", 0, buff, pos - buff) ||
|
|
(pkt_len= my_net_read(&net)) == packet_error ||
|
|
pkt_len < MIN_HANDSHAKE_SIZE)
|
|
{
|
|
net_send_error(&net, ER_HANDSHAKE_ERROR);
|
|
return 1;
|
|
}
|
|
|
|
client_capabilities= uint2korr(net.read_pos);
|
|
if (!(client_capabilities & CLIENT_PROTOCOL_41))
|
|
{
|
|
net_send_error_323(&net, ER_NOT_SUPPORTED_AUTH_MODE);
|
|
return 1;
|
|
}
|
|
client_capabilities|= ((ulong) uint2korr(net.read_pos + 2)) << 16;
|
|
|
|
pos= (char*) net.read_pos + 32;
|
|
|
|
/* At least one byte for username and one byte for password */
|
|
if (pos >= (char*) net.read_pos + pkt_len + 2)
|
|
{
|
|
/*TODO add user and password handling in error messages*/
|
|
net_send_error(&net, ER_HANDSHAKE_ERROR);
|
|
return 1;
|
|
}
|
|
|
|
const char *user= pos;
|
|
const char *password= strend(user)+1;
|
|
ulong password_len= *password++;
|
|
LEX_STRING user_name= { (char *) user, password - user - 2 };
|
|
|
|
if (password_len != SCRAMBLE_LENGTH)
|
|
{
|
|
net_send_error(&net, ER_ACCESS_DENIED_ERROR);
|
|
return 1;
|
|
}
|
|
if (user_map.authenticate(&user_name, password, scramble))
|
|
{
|
|
net_send_error(&net, ER_ACCESS_DENIED_ERROR);
|
|
return 1;
|
|
}
|
|
net_send_ok(&net, connection_id, NULL);
|
|
return 0;
|
|
}
|
|
|
|
|
|
int Mysql_connection_thread::do_command()
|
|
{
|
|
char *packet;
|
|
ulong packet_length;
|
|
|
|
/* We start to count packets from 0 for each new command */
|
|
net.pkt_nr= 0;
|
|
|
|
if ((packet_length=my_net_read(&net)) == packet_error)
|
|
{
|
|
/* Check if we can continue without closing the connection */
|
|
if (net.error != 3) // what is 3 - find out
|
|
return 1;
|
|
if (thread_registry.is_shutdown())
|
|
return 1;
|
|
net_send_error(&net, net.last_errno);
|
|
net.error= 0;
|
|
return 0;
|
|
}
|
|
else
|
|
{
|
|
if (thread_registry.is_shutdown())
|
|
return 1;
|
|
packet= (char*) net.read_pos;
|
|
enum enum_server_command command= (enum enum_server_command)
|
|
(uchar) *packet;
|
|
log_info("connection %d: packet_length=%d, command=%d",
|
|
connection_id, packet_length, command);
|
|
return dispatch_command(command, packet + 1, packet_length - 1);
|
|
}
|
|
}
|
|
|
|
int Mysql_connection_thread::dispatch_command(enum enum_server_command command,
|
|
const char *packet, uint len)
|
|
{
|
|
switch (command) {
|
|
case COM_QUIT: // client exit
|
|
log_info("query for connection %d received quit command", connection_id);
|
|
return 1;
|
|
case COM_PING:
|
|
log_info("query for connection %d received ping command", connection_id);
|
|
net_send_ok(&net, connection_id, NULL);
|
|
break;
|
|
case COM_QUERY:
|
|
{
|
|
log_info("query for connection %d : ----\n%s\n-------------------------",
|
|
connection_id,packet);
|
|
if (Command *command= parse_command(&instance_map, packet))
|
|
{
|
|
int res= 0;
|
|
log_info("query for connection %d successfully parsed",connection_id);
|
|
res= command->execute(&net, connection_id);
|
|
delete command;
|
|
if (!res)
|
|
log_info("query for connection %d executed ok",connection_id);
|
|
else
|
|
{
|
|
log_info("query for connection %d executed err=%d",connection_id,res);
|
|
net_send_error(&net, res);
|
|
return 0;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
net_send_error(&net,ER_OUT_OF_RESOURCES);
|
|
return 0;
|
|
}
|
|
break;
|
|
}
|
|
default:
|
|
log_info("query for connection %d received unknown command",connection_id);
|
|
net_send_error(&net, ER_UNKNOWN_COM_ERROR);
|
|
break;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
pthread_handler_t mysql_connection(void *arg)
|
|
{
|
|
Mysql_connection_thread_args *args= (Mysql_connection_thread_args *) arg;
|
|
Mysql_connection_thread mysql_connection_thread(*args);
|
|
delete args;
|
|
if (mysql_connection_thread.init())
|
|
log_info("mysql_connection(): error initializing thread");
|
|
else
|
|
{
|
|
mysql_connection_thread.run();
|
|
mysql_connection_thread.cleanup();
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
vim: fdm=marker
|
|
*/
|