From 8524c24a8190e28f220ed2f177880a975c82ecec Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Mon, 24 Oct 2016 18:24:54 +1100 Subject: [PATCH] Revert "ctdb-common: Use SCHED_RESET_ON_FORK when setting SCHED_FIFO" BUG: https://bugzilla.samba.org/show_bug.cgi?id=12392 Feature SCHED_RESET_ON_FORK is completely broken on RHEL6 and RHEL7 distributions. So do not rely on SCHED_RESET_ON_FORK for now. This reverts commit 1be8564e553ce044426dbe7b3987edf514832940. Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke Autobuild-User(master): Martin Schwenke Autobuild-Date(master): Tue Oct 25 11:28:28 CEST 2016 on sn-devel-144 (cherry picked from commit 71b69b0169dc6e2843325f1567f64b6acd43e6b8) --- ctdb/common/system_util.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ctdb/common/system_util.c b/ctdb/common/system_util.c index e6c4f17..738bf9c 100644 --- a/ctdb/common/system_util.c +++ b/ctdb/common/system_util.c @@ -67,14 +67,10 @@ bool set_scheduler(void) #else /* no AIX */ #if HAVE_SCHED_SETSCHEDULER struct sched_param p; - int policy = SCHED_FIFO; p.sched_priority = 1; -#ifdef SCHED_RESET_ON_FORK - policy |= SCHED_RESET_ON_FORK; -#endif - if (sched_setscheduler(0, policy, &p) == -1) { + if (sched_setscheduler(0, SCHED_FIFO, &p) == -1) { DEBUG(DEBUG_CRIT,("Unable to set scheduler to SCHED_FIFO (%s)\n", strerror(errno))); return false; @@ -107,7 +103,6 @@ void reset_scheduler(void) #endif #else /* no AIX */ #if HAVE_SCHED_SETSCHEDULER -#ifndef SCHED_RESET_ON_FORK struct sched_param p; p.sched_priority = 0; @@ -116,7 +111,6 @@ void reset_scheduler(void) } #endif #endif -#endif } void set_nonblocking(int fd) -- 2.7.4