disable SCHED_RR

diff --git a/Makefile b/Makefile
index 281ee7a3dfa1de3697470734d3ead2167c0acc74..e3cde317084726dad97f94b8b1b875dc44188bca 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-RELEASE=2.2
+RELEASE=2.3
 
 # source from http://www.corosync.org
 
 CSVERSION=1.4.4
-CSRELEASE=1
+CSRELEASE=2
 CSDIR=corosync-${CSVERSION}
 CSSRC=corosync-${CSVERSION}.orig.tar.gz
 

diff --git a/debian/changelog b/debian/changelog
index e33e4855b51ae0938e66aa6f907189fb6ec4e452..d8c42acca634673db2f48ed4e238db9077d9858a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+corosync-pve (1.4.4-2) unstable; urgency=low
+
+  * disable SCHED_RR (RT_GROUP_SCHED was disabled in our kernel
+    anyways). In newer kernels this is enabled, but causes corosync to
+    crash.
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 11 Jan 2013 15:39:40 +0100
+
 corosync-pve (1.4.4-1) unstable; urgency=low
 
   *  update to 1.4.4

diff --git a/debian/patches/disable-sched-rr.patch b/debian/patches/disable-sched-rr.patch
new file mode 100644 (file)
index 0000000..69f6bc6
--- /dev/null
+++ b/debian/patches/disable-sched-rr.patch
@@ -0,0 +1,36 @@
+Index: new/exec/main.c
+===================================================================
+--- new.orig/exec/main.c       2013-01-11 15:35:35.000000000 +0100
++++ new/exec/main.c    2013-01-11 15:36:39.000000000 +0100
+@@ -1265,7 +1265,7 @@
+ 
+ static void corosync_setscheduler (void)
+ {
+-#if defined(HAVE_PTHREAD_SETSCHEDPARAM) && defined(HAVE_SCHED_GET_PRIORITY_MAX) && defined(HAVE_SCHED_SETSCHEDULER)
++#if 0 && defined(HAVE_PTHREAD_SETSCHEDPARAM) && defined(HAVE_SCHED_GET_PRIORITY_MAX) && defined(HAVE_SCHED_SETSCHEDULER)
+       int res;
+ 
+       sched_priority = sched_get_priority_max (SCHED_RR);
+@@ -1301,9 +1301,6 @@
+                       "Could not get maximum scheduler priority");
+               sched_priority = 0;
+       }
+-#else
+-      log_printf(LOGSYS_LEVEL_WARNING,
+-              "The Platform is missing process priority setting features.  Leaving at default.");
+ #endif
+ }
+ 
+Index: new/exec/timer.c
+===================================================================
+--- new.orig/exec/timer.c      2013-01-11 15:35:40.000000000 +0100
++++ new/exec/timer.c   2013-01-11 15:35:46.000000000 +0100
+@@ -109,7 +109,7 @@
+       int fds;
+       unsigned long long timeout;
+ 
+-#if defined(HAVE_PTHREAD_SETSCHEDPARAM) && defined(HAVE_SCHED_GET_PRIORITY_MAX)
++#if 0 && defined(HAVE_PTHREAD_SETSCHEDPARAM) && defined(HAVE_SCHED_GET_PRIORITY_MAX)
+       if (sched_priority != 0) {
+               struct sched_param sched_param;
+ 

diff --git a/debian/patches/series b/debian/patches/series
index 201404e1d90de8ca99f433d0a09140be6529c7e2..b614d82ea8d8e41bd9c8f56008feb887ee336cce 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 #default-config.diff
 #corosync-keygen.diff
 cpg-join-fix.diff
+disable-sched-rr.patch