database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Bug #12673: Instance Manager: allows to stop the instance many times

Browse Source 
The instance manager was not actually checking whether an instance
  was actually running before trying to stop it. Now it checks first.


mysql-test/r/im_life_cycle.result:
  Add new results
mysql-test/t/im_life_cycle.imtest:
  Add new regression test
server-tools/instance-manager/instance.cc:
  Fix Instance::stop() to report ER_INSTANCE_IS_NOT_STARTED when that is
  the case. Also removed unnecessary goto.
server-tools/instance-manager/messages.cc:
  Fix messages with missing spaces
This commit is contained in:
unknown
2006-07-12 12:30:22 -07:00
parent 67d53e36cd
commit 812c9cc84a
4 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/im_life_cycle.result
View File

@@ -74,3 +74,6 @@ START INSTANCE mysqld1,mysqld2,mysqld3;
ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
STOP INSTANCE mysqld1,mysqld2,mysqld3; STOP INSTANCE mysqld1,mysqld2,mysqld3;
ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use ERROR 42000: You have an error in your command syntax. Check the manual that corresponds to your MySQL Instance Manager version for the right syntax to use
STOP INSTANCE mysqld2;
ERROR HY000: Cannot stop instance. Perhaps the instance is not started, or was started manually, so IM cannot find the pidfile.
End of 5.0 tests

8
mysql-test/t/im_life_cycle.imtest
View File

@@ -218,3 +218,11 @@ START INSTANCE mysqld1,mysqld2,mysqld3;
--error ER_SYNTAX_ERROR --error ER_SYNTAX_ERROR
STOP INSTANCE mysqld1,mysqld2,mysqld3; STOP INSTANCE mysqld1,mysqld2,mysqld3;
#
# Bug #12673: Instance Manager: allows to stop the instance many times
#
--error 3001
STOP INSTANCE mysqld2;
--echo End of 5.0 tests

7
server-tools/instance-manager/instance.cc
View File

@@ -469,6 +469,8 @@ int Instance::stop()
struct timespec timeout; struct timespec timeout;
uint waitchild= (uint) DEFAULT_SHUTDOWN_DELAY; uint waitchild= (uint) DEFAULT_SHUTDOWN_DELAY;
if (is_running())
{
if (options.shutdown_delay_val) if (options.shutdown_delay_val)
waitchild= options.shutdown_delay_val; waitchild= options.shutdown_delay_val;
@@ -478,7 +480,7 @@ int Instance::stop()
timeout.tv_sec= time(NULL) + waitchild; timeout.tv_sec= time(NULL) + waitchild;
timeout.tv_nsec= 0; timeout.tv_nsec= 0;
if (pthread_mutex_lock(&LOCK_instance)) if (pthread_mutex_lock(&LOCK_instance))
goto err; return ER_STOP_INSTANCE;
while (options.get_pid() != 0) /* while server isn't stopped */ while (options.get_pid() != 0) /* while server isn't stopped */
{ {
@@ -496,10 +498,9 @@ int Instance::stop()
kill_instance(SIGKILL); kill_instance(SIGKILL);
return 0; return 0;
}
return ER_INSTANCE_IS_NOT_STARTED; return ER_INSTANCE_IS_NOT_STARTED;
err:
return ER_STOP_INSTANCE;
} }
#ifdef __WIN__ #ifdef __WIN__

6
server-tools/instance-manager/messages.cc
View File

@@ -48,8 +48,8 @@ static const char *mysqld_error_message(unsigned sql_errno)
case ER_BAD_INSTANCE_NAME: case ER_BAD_INSTANCE_NAME:
return "Bad instance name. Check that the instance with such a name exists"; return "Bad instance name. Check that the instance with such a name exists";
case ER_INSTANCE_IS_NOT_STARTED: case ER_INSTANCE_IS_NOT_STARTED:
return "Cannot stop instance. Perhaps the instance is not started, or was started" return "Cannot stop instance. Perhaps the instance is not started, or was"
"manually, so IM cannot find the pidfile."; " started manually, so IM cannot find the pidfile.";
case ER_INSTANCE_ALREADY_STARTED: case ER_INSTANCE_ALREADY_STARTED:
return "The instance is already started"; return "The instance is already started";
case ER_CANNOT_START_INSTANCE: case ER_CANNOT_START_INSTANCE:
@@ -67,7 +67,7 @@ static const char *mysqld_error_message(unsigned sql_errno)
return "Cannot open log file"; return "Cannot open log file";
case ER_GUESS_LOGFILE: case ER_GUESS_LOGFILE:
return "Cannot guess the log filename. Try specifying full log name" return "Cannot guess the log filename. Try specifying full log name"
"in the instance options"; " in the instance options";
case ER_ACCESS_OPTION_FILE: case ER_ACCESS_OPTION_FILE:
return "Cannot open the option file to edit. Check permissions"; return "Cannot open the option file to edit. Check permissions";
default: default: