From mboxrd@z Thu Jan 1 00:00:00 1970 From: lhh@sourceware.org Date: 12 Apr 2007 17:25:49 -0000 Subject: [Cluster-devel] cluster/rgmanager src/daemons/main.c ChangeLog Message-ID: <20070412172549.17926.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: cluster Changes by: lhh at sourceware.org 2007-04-12 18:25:48 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&r1=1.36&r2=1.37 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&r1=1.32&r2=1.33 --- cluster/rgmanager/src/daemons/main.c 2007/03/27 19:33:20 1.36 +++ cluster/rgmanager/src/daemons/main.c 2007/04/12 17:25:48 1.37 @@ -882,6 +882,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"); @@ -917,18 +929,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 2007/03/27 19:33:19 1.32 +++ cluster/rgmanager/ChangeLog 2007/04/12 17:25:48 1.33 @@ -1,3 +1,7 @@ +2007-04-12 Lon Hohberger + * src/daemons/main.c: Fix watchdog race condition causing + reboot; patch from Andrey Mirkin; bugzilla #236204 + 2007-03-27 Lon Hohberger * Merge patch from Crosswalk development team: * Scott Cannata