mirror of
https://github.com/MariaDB/server.git
synced 2025-11-22 17:44:29 +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.
207 lines
4.5 KiB
C++
207 lines
4.5 KiB
C++
#include <windows.h>
|
|
#include <assert.h>
|
|
#include ".\windowsservice.h"
|
|
|
|
static WindowsService *gService;
|
|
|
|
WindowsService::WindowsService(void) :
|
|
statusCheckpoint(0),
|
|
serviceName(NULL),
|
|
inited(FALSE),
|
|
dwAcceptedControls(SERVICE_ACCEPT_STOP),
|
|
debugging(FALSE)
|
|
{
|
|
gService= this;
|
|
status.dwServiceType= SERVICE_WIN32_OWN_PROCESS;
|
|
status.dwServiceSpecificExitCode= 0;
|
|
}
|
|
|
|
WindowsService::~WindowsService(void)
|
|
{
|
|
}
|
|
|
|
BOOL WindowsService::Install()
|
|
{
|
|
bool ret_val= FALSE;
|
|
SC_HANDLE newService;
|
|
SC_HANDLE scm;
|
|
|
|
if (IsInstalled())
|
|
return TRUE;
|
|
|
|
// determine the name of the currently executing file
|
|
char szFilePath[_MAX_PATH];
|
|
GetModuleFileName(NULL, szFilePath, sizeof(szFilePath));
|
|
|
|
// open a connection to the SCM
|
|
if (!(scm= OpenSCManager(0, 0,SC_MANAGER_CREATE_SERVICE)))
|
|
return FALSE;
|
|
|
|
newService= CreateService(scm, serviceName, displayName,
|
|
SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS,
|
|
SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
|
|
szFilePath, NULL, NULL, NULL, username,
|
|
password);
|
|
|
|
if (newService)
|
|
{
|
|
CloseServiceHandle(newService);
|
|
ret_val= TRUE;
|
|
}
|
|
|
|
CloseServiceHandle(scm);
|
|
return ret_val;
|
|
}
|
|
|
|
BOOL WindowsService::Init()
|
|
{
|
|
assert(serviceName != NULL);
|
|
|
|
if (inited)
|
|
return TRUE;
|
|
|
|
SERVICE_TABLE_ENTRY stb[] =
|
|
{
|
|
{ (LPSTR)serviceName, (LPSERVICE_MAIN_FUNCTION) ServiceMain},
|
|
{ NULL, NULL }
|
|
};
|
|
inited= TRUE;
|
|
return StartServiceCtrlDispatcher(stb); //register with the Service Manager
|
|
}
|
|
|
|
BOOL WindowsService::Remove()
|
|
{
|
|
bool ret_val= FALSE;
|
|
|
|
if (!IsInstalled())
|
|
return TRUE;
|
|
|
|
// open a connection to the SCM
|
|
SC_HANDLE scm= OpenSCManager(0, 0,SC_MANAGER_CREATE_SERVICE);
|
|
if (!scm)
|
|
return FALSE;
|
|
|
|
SC_HANDLE service= OpenService(scm, serviceName, DELETE);
|
|
if (service)
|
|
{
|
|
if (DeleteService(service))
|
|
ret_val= TRUE;
|
|
DWORD dw= ::GetLastError();
|
|
CloseServiceHandle(service);
|
|
}
|
|
|
|
CloseServiceHandle(scm);
|
|
return ret_val;
|
|
}
|
|
|
|
BOOL WindowsService::IsInstalled()
|
|
{
|
|
BOOL ret_val= FALSE;
|
|
|
|
SC_HANDLE scm= ::OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT);
|
|
SC_HANDLE serv_handle= ::OpenService(scm, serviceName, SERVICE_QUERY_STATUS);
|
|
|
|
ret_val= serv_handle != NULL;
|
|
|
|
::CloseServiceHandle(serv_handle);
|
|
::CloseServiceHandle(scm);
|
|
|
|
return ret_val;
|
|
}
|
|
|
|
void WindowsService::SetAcceptedControls(DWORD acceptedControls)
|
|
{
|
|
dwAcceptedControls= acceptedControls;
|
|
}
|
|
|
|
|
|
BOOL WindowsService::ReportStatus(DWORD currentState, DWORD waitHint,
|
|
DWORD dwError)
|
|
{
|
|
if (debugging)
|
|
return TRUE;
|
|
|
|
if(currentState == SERVICE_START_PENDING)
|
|
status.dwControlsAccepted= 0;
|
|
else
|
|
status.dwControlsAccepted= dwAcceptedControls;
|
|
|
|
status.dwCurrentState= currentState;
|
|
status.dwWin32ExitCode= dwError != 0 ?
|
|
ERROR_SERVICE_SPECIFIC_ERROR : NO_ERROR;
|
|
status.dwWaitHint= waitHint;
|
|
status.dwServiceSpecificExitCode= dwError;
|
|
|
|
if(currentState == SERVICE_RUNNING || currentState == SERVICE_STOPPED)
|
|
{
|
|
status.dwCheckPoint= 0;
|
|
statusCheckpoint= 0;
|
|
}
|
|
else
|
|
status.dwCheckPoint= ++statusCheckpoint;
|
|
|
|
// Report the status of the service to the service control manager.
|
|
BOOL result= SetServiceStatus(statusHandle, &status);
|
|
if (!result)
|
|
Log("ReportStatus failed");
|
|
|
|
return result;
|
|
}
|
|
|
|
void WindowsService::RegisterAndRun(DWORD argc, LPTSTR *argv)
|
|
{
|
|
statusHandle= ::RegisterServiceCtrlHandler(serviceName, ControlHandler);
|
|
if (statusHandle && ReportStatus(SERVICE_START_PENDING))
|
|
Run(argc, argv);
|
|
ReportStatus(SERVICE_STOPPED);
|
|
}
|
|
|
|
void WindowsService::HandleControlCode(DWORD opcode)
|
|
{
|
|
// Handle the requested control code.
|
|
switch(opcode) {
|
|
case SERVICE_CONTROL_STOP:
|
|
// Stop the service.
|
|
status.dwCurrentState= SERVICE_STOP_PENDING;
|
|
Stop();
|
|
break;
|
|
|
|
case SERVICE_CONTROL_PAUSE:
|
|
status.dwCurrentState= SERVICE_PAUSE_PENDING;
|
|
Pause();
|
|
break;
|
|
|
|
case SERVICE_CONTROL_CONTINUE:
|
|
status.dwCurrentState= SERVICE_CONTINUE_PENDING;
|
|
Continue();
|
|
break;
|
|
|
|
case SERVICE_CONTROL_SHUTDOWN:
|
|
Shutdown();
|
|
break;
|
|
|
|
case SERVICE_CONTROL_INTERROGATE:
|
|
ReportStatus(status.dwCurrentState);
|
|
break;
|
|
|
|
default:
|
|
// invalid control code
|
|
break;
|
|
}
|
|
}
|
|
|
|
void WINAPI WindowsService::ServiceMain(DWORD argc, LPTSTR *argv)
|
|
{
|
|
assert(gService != NULL);
|
|
|
|
// register our service control handler:
|
|
gService->RegisterAndRun(argc, argv);
|
|
}
|
|
|
|
void WINAPI WindowsService::ControlHandler(DWORD opcode)
|
|
{
|
|
assert(gService != NULL);
|
|
|
|
return gService->HandleControlCode(opcode);
|
|
}
|