Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new

2 files changed, 37 insertions, 30 deletions

diff --git a/server-tools/instance-manager/guardian.cc b/server-tools/instance-manager/guardian.cc
index 7a9ff3e8367..b58241272f9 100644
--- a/server-tools/instance-manager/guardian.cc
+++ b/server-tools/instance-manager/guardian.cc
@@ -175,9 +175,12 @@ void Guardian_thread::process_instance(Instance *instance,
     case JUST_CRASHED:
       if (current_time - current_node->crash_moment <= 2)
       {
-        instance->start();
-        log_info("guardian: starting instance %s",
-                 instance->options.instance_name);
+        if (instance->is_crashed())
+        {
+          instance->start();
+          log_info("guardian: starting instance %s",
+                   instance->options.instance_name);
+        }
       }
       else
         current_node->state= CRASHED;
@@ -188,11 +191,14 @@ void Guardian_thread::process_instance(Instance *instance,
       {
         if ((current_node->restart_counter < restart_retry))
         {
-          instance->start();
-          current_node->last_checked= current_time;
-          current_node->restart_counter++;
-          log_info("guardian: restarting instance %s",
-                   instance->options.instance_name);
+          if (instance->is_crashed())
+          {
+            instance->start();
+            current_node->last_checked= current_time;
+            current_node->restart_counter++;
+            log_info("guardian: restarting instance %s",
+                     instance->options.instance_name);
+          }
         }
         else
         {
diff --git a/server-tools/instance-manager/manager.cc b/server-tools/instance-manager/manager.cc
index e2bb09cb9fa..599131089ed 100644
--- a/server-tools/instance-manager/manager.cc
+++ b/server-tools/instance-manager/manager.cc
@@ -198,28 +198,6 @@ void manager()
   if (create_pid_file(Options::Main::pid_file_name, manager_pid))
     return; /* necessary logging has been already done. */
 
-  sigset_t mask;
-  set_signals(&mask);
-
-  /* create the listener */
-  {
-    pthread_t listener_thd_id;
-    pthread_attr_t listener_thd_attr;
-    int rc;
-
-    pthread_attr_init(&listener_thd_attr);
-    pthread_attr_setdetachstate(&listener_thd_attr, PTHREAD_CREATE_DETACHED);
-    rc= set_stacksize_n_create_thread(&listener_thd_id, &listener_thd_attr,
-                                      listener, &listener_args);
-    pthread_attr_destroy(&listener_thd_attr);
-    if (rc)
-    {
-      log_error("manager(): set_stacksize_n_create_thread(listener) failed");
-      goto err;
-    }
-
-  }
-
   /* create guardian thread */
   {
     pthread_t guardian_thd_id;
@@ -268,6 +246,29 @@ void manager()
     }
   }
 
+  /* Initialize signals and alarm-infrastructure. */
+
+  sigset_t mask;
+  set_signals(&mask);
+
+  /* create the listener */
+  {
+    pthread_t listener_thd_id;
+    pthread_attr_t listener_thd_attr;
+    int rc;
+
+    pthread_attr_init(&listener_thd_attr);
+    pthread_attr_setdetachstate(&listener_thd_attr, PTHREAD_CREATE_DETACHED);
+    rc= set_stacksize_n_create_thread(&listener_thd_id, &listener_thd_attr,
+                                      listener, &listener_args);
+    pthread_attr_destroy(&listener_thd_attr);
+    if (rc)
+    {
+      log_error("manager(): set_stacksize_n_create_thread(listener) failed");
+      goto err;
+    }
+  }
+
   /*
     After the list of guarded instances have been initialized,
     Guardian should start them.