Attachment 703488 Details for Bug 916227 – Proposed patch

[patch] Proposed patch

2013-02-27-0001-Move-corosync-exit-semaphore-initialization.patch (text/plain), 1.79 KB, created by Jan Friesse on 2013-02-27 15:11:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2013-02-27 15:11:11 UTC

Size: 1.79 KB

patch

obsolete

>From 1340b9372cb12ff327a87154568567786e7f6e65 Mon Sep 17 00:00:00 2001
>From: jason <huzhijiang@gmail.com>
>Date: Wed, 27 Feb 2013 15:34:48 +0100
>Subject: [PATCH] Move corosync exit semaphore initialization
>
>When signal is delivered before initialization of exit semaphore,
>corosync will never exit. Solution is to initialize semaphore earlier.
>
>Signed-off-by: jason <huzhijiang@gmail.com>
>---
> exec/main.c |   16 +++++++++-------
> 1 files changed, 9 insertions(+), 7 deletions(-)
>
>diff --git a/exec/main.c b/exec/main.c
>index 1d581ff..6c8ea35 100644
>--- a/exec/main.c
>+++ b/exec/main.c
>@@ -1620,6 +1620,14 @@ int main (int argc, char **argv, char **envp)
> 	log_printf (LOGSYS_LEVEL_NOTICE, "Corosync Cluster Engine ('%s'): started and ready to provide service.\n", VERSION);
> 	log_printf (LOGSYS_LEVEL_INFO, "Corosync built-in features:" PACKAGE_FEATURES "\n");
> 
>+	/*
>+	 * Create exit semaphore
>+	 */
>+	res = sem_init (&corosync_exit_sem, 0, 0);
>+	if (res != 0) {
>+		log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't create exit thread.\n");
>+		corosync_exit_error (AIS_DONE_FATAL_ERR);
>+	}
> 
> 	(void)signal (SIGINT, sigintr_handler);
> 	(void)signal (SIGUSR2, sigusr2_handler);
>@@ -1803,14 +1811,8 @@ int main (int argc, char **argv, char **envp)
> // TODO what is this hack for?	usleep(totem_config.token_timeout * 2000);
> 
> 	/*
>-	 * Create semaphore and start "exit" thread
>+	 * Start "exit" thread
> 	 */
>-	res = sem_init (&corosync_exit_sem, 0, 0);
>-	if (res != 0) {
>-		log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't create exit thread.\n");
>-		corosync_exit_error (AIS_DONE_FATAL_ERR);
>-	}
>-
> 	res = pthread_create (&corosync_exit_thread, NULL, corosync_exit_thread_handler, NULL);
> 	if (res != 0) {
> 		log_printf (LOGSYS_LEVEL_ERROR, "Corosync Executive couldn't create exit thread.\n");
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 916227: 703488