[Cluster-devel] cluster/rgmanager src/daemons/main.c ChangeLog

[lhh at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	lhh at sourceware.org	2007-04-12 18:23:05

Modified files:
	rgmanager/src/daemons: main.c 
	rgmanager      : ChangeLog 

Log message:
	Fix watchdog race on rgmanager exit; BZ#236204, patch from Andrey Mirkin

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/main.c.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.34.2.1&r2=1.34.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.31&r2=1.31.2.1

--- cluster/rgmanager/src/daemons/main.c	2007/03/20 17:09:11	1.34.2.1
+++ cluster/rgmanager/src/daemons/main.c	2007/04/12 17:23:05	1.34.2.2
@@ -881,6 +881,18 @@
 			clulog(LOG_NOTICE, "Failed to start watchdog\n");
 	}
 
+	setup_signal(SIGINT, flag_shutdown);
+	setup_signal(SIGTERM, flag_shutdown);
+	setup_signal(SIGUSR1, statedump);
+	unblock_signal(SIGCHLD);
+	setup_signal(SIGPIPE, SIG_IGN);
+
+	if (debug) {
+		setup_signal(SIGSEGV, segfault);
+	} else {
+		unblock_signal(SIGSEGV);
+	}
+
 	clu_initialize(&clu);
 	if (cman_init_subsys(clu) < 0) {
 		perror("cman_init_subsys");
@@ -916,18 +928,6 @@
 		return -1;
 	}
 
-	setup_signal(SIGINT, flag_shutdown);
-	setup_signal(SIGTERM, flag_shutdown);
-	setup_signal(SIGUSR1, statedump);
-	unblock_signal(SIGCHLD);
-	setup_signal(SIGPIPE, SIG_IGN);
-
-	if (debug) {
-		setup_signal(SIGSEGV, segfault);
-	} else {
-		unblock_signal(SIGSEGV);
-	}
-
 	if (msg_listen(MSG_SOCKET, RGMGR_SOCK, me.cn_nodeid, &local_ctx) < 0) {
 		clulog(LOG_CRIT,
 		       "#10: Couldn't set up cluster message system: %s\n",
--- cluster/rgmanager/ChangeLog	2006/10/25 15:39:41	1.31
+++ cluster/rgmanager/ChangeLog	2007/04/12 17:23:05	1.31.2.1
@@ -1,3 +1,9 @@
+2007-04-12 Lon Hohberger <lhh at redhat.com>
+	* src/daemons/main.c: Fix watchdog race condition causing
+	reboot; patch from Andrey Mirkin; bugzilla #236204
+
+========
+	
 2006-10-25 Lon Hohberger <lhh at redhat.com>
 	* src/resources/clusterfs.sh: Fix unmounting problem (#212074)