A new user interface for you! Read more...

File cman_handle_int_and_term_signals_correctly.patch of Package cluster

commit 9a20e576b54a17841c6bb8a4795a253ecb8a4561
Author: Jan Friesse <jfriesse@redhat.com>
Date:   Mon Sep 27 15:27:59 2010 +0200

    Cman: Handle INT and TERM signals correctly
    
    Corosync signal handler (SIGINT and SIGTERM) is replaced by cman one,
    and this was settting quit_threads to 1. Regular cman shutdown sequence
    (cman_tool leave) tests if quit_threads is set or not. If so, it refuses
    continue so it was not possible to cleanly leave cluster.
    
    Now SIGINT and SIGTERM are ignored, and (un)intentional kill of corosync
    is no longer problem.
    
    Resolves: rhbz#617234

diff --git a/cman/daemon/daemon.c b/cman/daemon/daemon.c
index 64607cc..92cfd47 100644
--- a/cman/daemon/daemon.c
+++ b/cman/daemon/daemon.c
@@ -489,11 +489,6 @@ int num_listeners(void)
 	return count;
 }
 
-static void sigint_handler(int ignored)
-{
-	quit_threads = 1;
-}
-
 int cman_init(struct corosync_api_v1 *api)
 {
 	int fd;
@@ -514,12 +509,10 @@ int cman_init(struct corosync_api_v1 *api)
 		return -2;
 
 	/* Shutdown trap */
-	sa.sa_handler = sigint_handler;
-	sigaction(SIGINT, &sa, NULL);
-	sigaction(SIGTERM, &sa, NULL);
-
 	sa.sa_handler = SIG_IGN;
 	sigaction(SIGPIPE, &sa, NULL);
+	sigaction(SIGINT, &sa, NULL);
+	sigaction(SIGTERM, &sa, NULL);
 
 	return 0;
 }