database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my50-bug22379_runtime

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/bug22379_runtime/my51-bug22379_runtime


server-tools/instance-manager/guardian.cc:
  Auto merged
server-tools/instance-manager/instance.cc:
  Auto merged
server-tools/instance-manager/instance_options.cc:
  Auto merged
This commit is contained in:
unknown
2006-09-25 09:34:34 +02:00
parent 372d1c8c5a f91b91cf65
commit cd6a5b8775
3 changed files with 36 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server-tools/instance-manager/guardian.cc
View File

@ -145,21 +145,36 @@ void Guardian_thread::process_instance(Instance *instance,
} }
if (instance->is_running()) if (instance->is_running())
{
/* The instance can be contacted on it's port */
/* If STARTING also check that pidfile has been created */
if (current_node->state == STARTING &&
current_node->instance->options.get_pid() == 0)
{
/* Pid file not created yet, don't go to STARTED state yet */
}
else
{ {
/* clear status fields */ /* clear status fields */
log_info("guardian: instance %s is running, set state to STARTED",
instance->options.instance_name);
current_node->restart_counter= 0; current_node->restart_counter= 0;
current_node->crash_moment= 0; current_node->crash_moment= 0;
current_node->state= STARTED; current_node->state= STARTED;
} }
}
else else
{ {
switch (current_node->state) { switch (current_node->state) {
case NOT_STARTED: case NOT_STARTED:
instance->start();
current_node->last_checked= current_time;
log_info("guardian: starting instance %s", log_info("guardian: starting instance %s",
instance->options.instance_name); instance->options.instance_name);
/* NOTE, set state to STARTING _before_ start() is called */
current_node->state= STARTING; current_node->state= STARTING;
instance->start();
current_node->last_checked= current_time;
break; break;
case STARTED: /* fallthrough */ case STARTED: /* fallthrough */
case STARTING: /* let the instance start or crash */ case STARTING: /* let the instance start or crash */

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

@ -611,18 +611,19 @@ void Instance::kill_instance(int signum)
/* if there are no pid, everything seems to be fine */ /* if there are no pid, everything seems to be fine */
if ((pid= options.get_pid()) != 0) /* get pid from pidfile */ if ((pid= options.get_pid()) != 0) /* get pid from pidfile */
{ {
/* if (kill(pid, signum) == 0)
If we cannot kill mysqld, then it has propably crashed. {
Let us try to remove staled pidfile and return successfully /* Kill suceeded */
as mysqld is probably stopped. if (signum == SIGKILL) /* really killed instance with SIGKILL */
*/ {
if (!kill(pid, signum)) log_error("The instance %s is being stopped forcibly. Normally" \
options.unlink_pidfile(); "it should not happen. Probably the instance has been" \
else if (signum == SIGKILL) /* really killed instance with SIGKILL */ "hanging. You should also check your IM setup",
log_error("The instance %s is being stopped forsibly. Normally \
it should not happed. Probably the instance has been \
hanging. You should also check your IM setup",
options.instance_name); options.instance_name);
/* After sucessful hard kill the pidfile need to be removed */
options.unlink_pidfile();
}
}
} }
return; return;
} }

3
server-tools/instance-manager/instance_options.cc
View File

@ -406,7 +406,8 @@ pid_t Instance_options::get_pid()
{ {
pid_t pid; pid_t pid;
fscanf(pid_file_stream, "%i", &pid); if (fscanf(pid_file_stream, "%i", &pid) != 1)
pid= -1;
my_fclose(pid_file_stream, MYF(0)); my_fclose(pid_file_stream, MYF(0));
return pid; return pid;
} }