cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [1/6] git commit: updated refs/heads/CLOUDSTACK-8443 to 3696fd3
Date Mon, 24 Aug 2015 06:12:17 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/CLOUDSTACK-8443 [created] 3696fd37d


CLOUDSTACK-8443: no need to specify cgroup_controllers

This setting works on CentOS 6 / RHEL 6 but does nothing, as
"cpu" cgroup is not mounted. On CentOS 7 / RHEL 7 systemd does
mount cgroups and "cpu" is co-mounted with "cpuacc". Hence, if
we specify "cpu" then this results in an error because it can
only use them both, or none.

By removing the setting, we rely on the default of qemu, which
is:
cgroup_controllers = ["cpu", "devices", "memory", "blkio", "cpuacct", "net_cls"]

Only if they are really mounted, they will be used. So, this will
work on both version 6 and 7.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e8fcaa87
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e8fcaa87
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e8fcaa87

Branch: refs/heads/CLOUDSTACK-8443
Commit: e8fcaa8736d4f870d28fdb8617402c78b0fe0a0a
Parents: 6d57a86
Author: Remi Bergsma <github@remi.nl>
Authored: Thu Aug 20 22:31:55 2015 +0200
Committer: Remi Bergsma <github@remi.nl>
Committed: Fri Aug 21 23:32:53 2015 +0200

----------------------------------------------------------------------
 python/lib/cloudutils/serviceConfig.py | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8fcaa87/python/lib/cloudutils/serviceConfig.py
----------------------------------------------------------------------
diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py
index b2adc31..54bfe26 100755
--- a/python/lib/cloudutils/serviceConfig.py
+++ b/python/lib/cloudutils/serviceConfig.py
@@ -493,7 +493,6 @@ class libvirtConfigRedhat(serviceCfgBase):
             filename = "/etc/libvirt/qemu.conf"
 
             cfo = configFileOps(filename, self)
-            cfo.addEntry("cgroup_controllers", "[\"cpu\"]")
             cfo.addEntry("security_driver", "\"none\"")
             cfo.addEntry("user", "\"root\"")
             cfo.addEntry("group", "\"root\"")


Mime
View raw message