This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: RHEL5 - rgmanager: Allow reboot if main proc. is killed
- From: Lon Hohberger <lon at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Tue, 19 May 2009 19:50:53 +0000 (UTC)
- Subject: cluster: RHEL5 - rgmanager: Allow reboot if main proc. is killed
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=d727e39ecd607b879ec3dc8841d599131ee7638d
Commit: d727e39ecd607b879ec3dc8841d599131ee7638d
Parent: df24d6192e1a60d91c507c7dc5e8de1a4eaa55a4
Author: Lon Hohberger <lhh@redhat.com>
AuthorDate: Tue May 19 15:45:13 2009 -0400
Committer: Lon Hohberger <lhh@redhat.com>
CommitterDate: Tue May 19 15:45:13 2009 -0400
rgmanager: Allow reboot if main proc. is killed
The Linux OOM killer uses SIGKILL to destroy processes.
While rgmanager isn't likely to die due to high memory
pressure due to a low 'badness' score, inadvertently
dying and not rebooting the node can have unintended
consequences.
Resolves: 488072
Signed-off-by: Lon Hohberger <lhh@redhat.com>
---
rgmanager/src/daemons/watchdog.c | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/rgmanager/src/daemons/watchdog.c b/rgmanager/src/daemons/watchdog.c
index c748382..9e3e9ac 100644
--- a/rgmanager/src/daemons/watchdog.c
+++ b/rgmanager/src/daemons/watchdog.c
@@ -21,6 +21,7 @@
#include <sys/wait.h>
#include <sys/reboot.h>
#include <stdlib.h>
+#include <sys/mman.h>
#include <signals.h>
#include <clulog.h>
@@ -68,6 +69,7 @@ watchdog_init(void)
return parent;
redirect_signals();
+ mlockall(MCL_CURRENT); /* shouldn't need MCL_FUTURE */
while (1) {
if (waitpid(child, &status, 0) <= 0)
@@ -78,20 +80,22 @@ watchdog_init(void)
if (WIFSIGNALED(status)) {
if (WTERMSIG(status) == SIGKILL) {
- clulog(LOG_CRIT, "Watchdog: Daemon killed, exiting\n");
- raise(SIGKILL);
- while(1) ;
+ /* Assume the admin did a 'killall' - it will
+ * kill us within a couple of seconds. If
+ * we are still alive after this sleep, it
+ * could have been the OOM killer killing
+ * rgmanager proper and we need to reboot.
+ */
+ sleep(3);
}
- else {
#ifdef DEBUG
- clulog(LOG_CRIT, "Watchdog: Daemon died, but not rebooting because DEBUG is set\n");
+ clulog(LOG_CRIT, "Watchdog: Daemon died, but not rebooting because DEBUG is set\n");
#else
- clulog(LOG_CRIT, "Watchdog: Daemon died, rebooting...\n");
- sync();
- reboot(RB_AUTOBOOT);
+ clulog(LOG_CRIT, "Watchdog: Daemon died, rebooting...\n");
+ sync();
+ reboot(RB_AUTOBOOT);
#endif
- exit(255);
- }
+ exit(255);
}
}
}