public inbox for cluster-cvs@sourceware.org
help / color / mirror / Atom feed
* rgmanager: master - rgmanager: Allow reboot if main proc. is killed
@ 2009-05-19 19:57 Lon Hohberger
0 siblings, 0 replies; only message in thread
From: Lon Hohberger @ 2009-05-19 19:57 UTC (permalink / raw)
To: cluster-cvs-relay
Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=aa4d48b19cd3925cab71f2d2e34b9362ebbfcad2
Commit: aa4d48b19cd3925cab71f2d2e34b9362ebbfcad2
Parent: 07e55b5fb5a82b5e1ee61b6145e6b2b6f16f1cb4
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:57:10 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 7dc004d..3846104 100644
--- a/rgmanager/src/daemons/watchdog.c
+++ b/rgmanager/src/daemons/watchdog.c
@@ -3,6 +3,7 @@
#include <sys/wait.h>
#include <sys/reboot.h>
#include <stdlib.h>
+#include <sys/mman.h>
#include <signals.h>
#include <logging.h>
@@ -50,6 +51,7 @@ watchdog_init(void)
return parent;
redirect_signals();
+ mlockall(MCL_CURRENT); /* shouldn't need MCL_FUTURE */
while (1) {
if (waitpid(child, &status, 0) <= 0)
@@ -60,20 +62,22 @@ watchdog_init(void)
if (WIFSIGNALED(status)) {
if (WTERMSIG(status) == SIGKILL) {
- logt_print(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
- logt_print(LOG_CRIT, "Watchdog: Daemon died, but not rebooting because DEBUG is set\n");
+ logt_print(LOG_CRIT, "Watchdog: Daemon died, but not rebooting because DEBUG is set\n");
#else
- logt_print(LOG_CRIT, "Watchdog: Daemon died, rebooting...\n");
- sync();
- reboot(RB_AUTOBOOT);
+ logt_print(LOG_CRIT, "Watchdog: Daemon died, rebooting...\n");
+ sync();
+ reboot(RB_AUTOBOOT);
#endif
- exit(255);
- }
+ exit(255);
}
}
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-05-19 19:57 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-05-19 19:57 rgmanager: master - rgmanager: Allow reboot if main proc. is killed Lon Hohberger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).