[NEW PATCH] BZ#688616 re-enable cgroups with kernel scaling issue fixed (via gerrit-bot)
Dan Kenigsberg
danken at redhat.com
Tue Sep 13 06:32:09 UTC 2011
New patch submitted by Dan Kenigsberg (danken at redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/929
commit 6648323e3c5961f8722ce0a6b08bc9bdb0f35b42
Author: Dan Kenigsberg <danken at redhat.com>
Date: Tue Sep 13 09:24:04 2011 +0300
BZ#688616 re-enable cgroups with kernel scaling issue fixed
Once we are shipping with kernel >= kernel-2.6.32-150 with a fix to
kernel BZ 623712, we can drop this hack an re-enable cgroups.
This reverts commit b48a4d9b2ce2162 and adds explicit kernel rpm
dependency.
Change-Id: Ibc3ec73a6eb2a5e195e3cfda8e153f0ae76eaafa
diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py
index 3f8423c..29258a5 100755
--- a/vds_bootstrap/vds_bootstrap.py
+++ b/vds_bootstrap/vds_bootstrap.py
@@ -75,7 +75,7 @@ if rhel6based:
VDSM_NAME = "vdsm"
VDSM_MIN_VER = VDSM_NAME + "-4.9"
KERNEL_VER = "2.6.32-.*.el6"
- KERNEL_MIN_VER = 115
+ KERNEL_MIN_VER = 150
MINIMAL_SUPPORTED_PLATFORM = "6.0"
else:
VDSM_NAME = "vdsm22"
@@ -121,8 +121,6 @@ CONFLICT_SERVICES = ['cpuspeed']
if rhel6based:
NEEDED_SERVICES.append('libvirtd')
CONFLICT_SERVICES.append('libvirt-guests')
- # Until BZ#623712 is solved - no cgroup for you !
- CONFLICT_SERVICES.append('cgconfig')
else:
CONFLICT_SERVICES.append('libvirtd')
diff --git a/vdsm.spec.in b/vdsm.spec.in
index f1a3473..cc34a6c 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -31,6 +31,7 @@ Requires: libvirt >= 0.9.4-2
Requires: libvirt-python
Requires: dosfstools
Requires: policycoreutils-python
+Requires: kernel >= kernel-2.6.32-150
Requires(post): cyrus-sasl-lib
BuildRequires: pyflakes
Conflicts: selinux-policy-targeted < 3.7.19-80.el6
diff --git a/vdsm/vdsmd.in b/vdsm/vdsmd.in
index d05603a..95aa918 100755
--- a/vdsm/vdsmd.in
+++ b/vdsm/vdsmd.in
@@ -32,9 +32,6 @@ DOM_METADATA_BACKUP_DIR=/var/log/vdsm/backup
CORE_PATTERN=/proc/sys/kernel/core_pattern
NEEDED_SERVICES="iscsid multipathd"
CONFLICTING_SERVICES="libvirt-guests libvirtd"
-# TODO: Remove cpu cgroup disabling when BZ#623712 is resolved (kernel on
-# massively multicore platforms failing to scale with cgroups turned on)
-CONFLICTING_SERVICES="cgconfig $CONFLICTING_SERVICES"
LCONF=/etc/libvirt/libvirtd.conf
QCONF=/etc/libvirt/qemu.conf
More information about the vdsm-patches
mailing list