mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-31 15:50:51 +03:00 
			
		
		
		
	 3b74668bfa
			
		
	
	3b74668bfa
	
	
	
		
			
			tests fail on FreeBSD.
The patch contains of the following:
  - make Instance Manager, running in the daemon mode, dump
    the pid of angel-process in the special file;
  - default value of angel-pid-file-name is 'mysqlmanager.angel.pid';
  - if ordinary (IM) pid-file-name is specified in the configuration,
    angel-pid-file-name is updated according to the following
    rule: extension of the basename of pid-file-name is replaced by
    '.angel.pid.
    For example:
    - pid-file-name: /tmp/im.pid
      => angel-pid-file-name: /tmp/im.angel.pid
    - pid-file-name: /tmp/im.txt
      => angel-pid-file-name: /tmp/im.angel.pid
    - pid-file-name: /tmp/5.0/im
      => angel-pid-file-name: /tmp/5.0/im.angel.pid
  - add support for configuration option to customize angel
    pid file name;
  - fix test suite to use angel pid to kill Instance Manager
    by all means if something went wrong.
Background
----------
The problem is that on some OSes (FreeBSD for one) Instance
Manager does not get SIGTERM, so can not shutdown gracefully.
Test suite wasn't able to cope with it, so this leads to the
mess in test results.
The problem should be split into two:
  - fix signal handling;
  - fix test suite.
This patch fixes test suite so that it will be able to kill
uncooperative Instance Manager. In order to achieve this,
test suite needs to know PID of IM Angel process.
		
	
		
			
				
	
	
		
			271 lines
		
	
	
		
			6.8 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			271 lines
		
	
	
		
			6.8 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 */
 | |
| 
 | |
| #include <my_global.h>
 | |
| #include "manager.h"
 | |
| 
 | |
| #include "priv.h"
 | |
| #include "thread_registry.h"
 | |
| #include "listener.h"
 | |
| #include "instance_map.h"
 | |
| #include "options.h"
 | |
| #include "user_map.h"
 | |
| #include "log.h"
 | |
| #include "guardian.h"
 | |
| 
 | |
| #include <my_sys.h>
 | |
| #include <m_string.h>
 | |
| #include <signal.h>
 | |
| #include <thr_alarm.h>
 | |
| #ifndef __WIN__
 | |
| #include <sys/wait.h>
 | |
| #endif
 | |
| 
 | |
| 
 | |
| int create_pid_file(const char *pid_file_name, int pid)
 | |
| {
 | |
|   if (FILE *pid_file= my_fopen(pid_file_name,
 | |
|                                O_WRONLY | O_CREAT | O_BINARY, MYF(0)))
 | |
|   {
 | |
|     fprintf(pid_file, "%d\n", (int) pid);
 | |
|     my_fclose(pid_file, MYF(0));
 | |
|     return 0;
 | |
|   }
 | |
|   log_error("can't create pid file %s: errno=%d, %s",
 | |
|             pid_file_name, errno, strerror(errno));
 | |
|   return 1;
 | |
| }
 | |
| 
 | |
| #ifndef __WIN__
 | |
| void set_signals(sigset_t *mask)
 | |
| {
 | |
|   /* block signals */
 | |
|   sigemptyset(mask);
 | |
|   sigaddset(mask, SIGINT);
 | |
|   sigaddset(mask, SIGTERM);
 | |
|   sigaddset(mask, SIGPIPE);
 | |
|   sigaddset(mask, SIGHUP);
 | |
|   signal(SIGPIPE, SIG_IGN);
 | |
| 
 | |
|   /*
 | |
|     We want this signal to be blocked in all theads but the signal
 | |
|     one. It is needed for the thr_alarm subsystem to work.
 | |
|   */
 | |
|   sigaddset(mask,THR_SERVER_ALARM);
 | |
| 
 | |
|   /* all new threads will inherite this signal mask */
 | |
|   pthread_sigmask(SIG_BLOCK, mask, NULL);
 | |
| 
 | |
|   /*
 | |
|      In our case the signal thread also implements functions of alarm thread.
 | |
|      Here we init alarm thread functionality. We suppose that we won't have
 | |
|      more then 10 alarms at the same time.
 | |
|   */
 | |
|   init_thr_alarm(10);
 | |
| }
 | |
| #else
 | |
| 
 | |
| bool have_signal;
 | |
| 
 | |
| void onsignal(int signo)
 | |
| {
 | |
|   have_signal= true;
 | |
| }
 | |
| 
 | |
| void set_signals(sigset_t *set)
 | |
| {
 | |
|   signal(SIGINT, onsignal);
 | |
|   signal(SIGTERM, onsignal);
 | |
|   have_signal= false;
 | |
| }
 | |
| 
 | |
| int my_sigwait(const sigset_t *set, int *sig)
 | |
| {
 | |
|   while (!have_signal)
 | |
|   {
 | |
|     Sleep(100);
 | |
|   }
 | |
|   return 0;
 | |
| }
 | |
| 
 | |
| #endif
 | |
| 
 | |
| 
 | |
| /*
 | |
|   manager - entry point to the main instance manager process: start
 | |
|   listener thread, write pid file and enter into signal handling.
 | |
|   See also comments in mysqlmanager.cc to picture general Instance Manager
 | |
|   architecture.
 | |
| */
 | |
| 
 | |
| void manager(const Options &options)
 | |
| {
 | |
|   Thread_registry thread_registry;
 | |
|   /*
 | |
|     All objects created in the manager() function live as long as
 | |
|     thread_registry lives, and thread_registry is alive until there are
 | |
|     working threads.
 | |
|   */
 | |
| 
 | |
|   User_map user_map;
 | |
|   Instance_map instance_map(options.default_mysqld_path);
 | |
|   Guardian_thread guardian_thread(thread_registry,
 | |
|                                   &instance_map,
 | |
|                                   options.monitoring_interval);
 | |
| 
 | |
|   Listener_thread_args listener_args(thread_registry, options, user_map,
 | |
|                                      instance_map);
 | |
| 
 | |
|   manager_pid= getpid();
 | |
|   instance_map.guardian= &guardian_thread;
 | |
| 
 | |
|   if (instance_map.init() || user_map.init())
 | |
|     return;
 | |
| 
 | |
|   if (user_map.load(options.password_file_name))
 | |
|     return;
 | |
| 
 | |
|   /* write Instance Manager pid file */
 | |
| 
 | |
|   log_info("IM pid file: '%s'; PID: %d.",
 | |
|            (const char *) options.pid_file_name,
 | |
|            (int) manager_pid);
 | |
| 
 | |
|   if (create_pid_file(options.pid_file_name, manager_pid))
 | |
|     return;
 | |
| 
 | |
|   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;
 | |
|     pthread_attr_t guardian_thd_attr;
 | |
|     int rc;
 | |
| 
 | |
|     /*
 | |
|        NOTE: Guardian should be shutdown first. Only then all other threads
 | |
|        need to be stopped. This should be done, as guardian is responsible for
 | |
|        shutting down the instances, and this is a long operation.
 | |
|     */
 | |
| 
 | |
|     pthread_attr_init(&guardian_thd_attr);
 | |
|     pthread_attr_setdetachstate(&guardian_thd_attr, PTHREAD_CREATE_DETACHED);
 | |
|     rc= set_stacksize_n_create_thread(&guardian_thd_id, &guardian_thd_attr,
 | |
|                                       guardian, &guardian_thread);
 | |
|     pthread_attr_destroy(&guardian_thd_attr);
 | |
|     if (rc)
 | |
|     {
 | |
|       log_error("manager(): set_stacksize_n_create_thread(guardian) failed");
 | |
|       goto err;
 | |
|     }
 | |
| 
 | |
|   }
 | |
| 
 | |
|   /*
 | |
|     To work nicely with LinuxThreads, the signal thread is the first thread
 | |
|     in the process.
 | |
|   */
 | |
|   int signo;
 | |
|   bool shutdown_complete;
 | |
| 
 | |
|   shutdown_complete= FALSE;
 | |
| 
 | |
|   if (instance_map.flush_instances())
 | |
|   {
 | |
|     log_error("Cannot init instances repository. This might be caused by "
 | |
|                "the wrong config file options. For instance, missing mysqld "
 | |
|                "binary. Aborting.");
 | |
|     return;
 | |
|   }
 | |
| 
 | |
|   /*
 | |
|     After the list of guarded instances have been initialized,
 | |
|     Guardian should start them.
 | |
|   */
 | |
|   pthread_cond_signal(&guardian_thread.COND_guardian);
 | |
| 
 | |
|   while (!shutdown_complete)
 | |
|   {
 | |
|     int status= 0;
 | |
| 
 | |
|     if ((status= my_sigwait(&mask, &signo)) != 0)
 | |
|     {
 | |
|       log_error("sigwait() failed");
 | |
|       goto err;
 | |
|     }
 | |
| 
 | |
| #ifndef __WIN__
 | |
| /*
 | |
|   On some Darwin kernels SIGHUP is delivered along with most
 | |
|   signals. This is why we skip it's processing on these
 | |
|   platforms. For more details and test program see
 | |
|   Bug #14164 IM tests fail on MacOS X (powermacg5)
 | |
| */
 | |
| #ifdef IGNORE_SIGHUP_SIGQUIT
 | |
|     if ( SIGHUP == signo )
 | |
|       continue;
 | |
| #endif
 | |
|     if (THR_SERVER_ALARM == signo)
 | |
|       process_alarm(signo);
 | |
|     else
 | |
| #endif
 | |
|     {
 | |
|       if (!guardian_thread.is_stopped())
 | |
|       {
 | |
|         bool stop_instances= true;
 | |
|         guardian_thread.request_shutdown(stop_instances);
 | |
|         pthread_cond_signal(&guardian_thread.COND_guardian);
 | |
|       }
 | |
|       else
 | |
|       {
 | |
|         thread_registry.deliver_shutdown();
 | |
|         shutdown_complete= TRUE;
 | |
|       }
 | |
|     }
 | |
|   }
 | |
| 
 | |
| err:
 | |
|   /* delete the pid file */
 | |
|   my_delete(options.pid_file_name, MYF(0));
 | |
| 
 | |
| #ifndef __WIN__
 | |
|   /* free alarm structures */
 | |
|   end_thr_alarm(1);
 | |
|   /* don't pthread_exit to kill all threads who did not shut down in time */
 | |
| #endif
 | |
| }
 | |
| 
 |