[NEW PATCH] BZ#688616 keep cgroup off as kernel support is not ready yet (via gerrit-bot)

[Dan Kenigsberg]

New patch submitted by Dan Kenigsberg (danken(a)redhat.com)

You can review this change at: http://gerrit.usersys.redhat.com/753

commit eef6e7a42c405759430ec7c13f37f5e2ae228aaa
Author: Dan Kenigsberg <danken(a)redhat.com&gt;
Date:   Wed Jul 27 15:52:36 2011 +0300

    BZ#688616 keep cgroup off as kernel support is not ready yet
    
    Sorry for the noise..
    
    Change-Id: Ia92e7ffb499f8c0251da8e216277635c10c733bd

diff --git a/vds_bootstrap/vds_bootstrap.py b/vds_bootstrap/vds_bootstrap.py
index 70af1a5..e56f651 100755
--- a/vds_bootstrap/vds_bootstrap.py
+++ b/vds_bootstrap/vds_bootstrap.py
@@ -63,7 +63,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"
@@ -110,8 +110,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/vdsmd b/vdsm/vdsmd
index 0591cb2..46c0f49 100755
--- a/vdsm/vdsmd
+++ b/vdsm/vdsmd
@@ -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