diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-02-24 03:38:24 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-02-24 03:38:58 +0100 |
| commit | 01efdf13a6ee9a14fd6d8b41a5d522d5917e1fbc (patch) | |
| tree | ed6aeb402c9b1262347d9abe43a026d80d290efa /src/core | |
| parent | c35fa384d00dc5dc7d9f339113b015a3f8a5cf79 (diff) | |
| download | systemd-01efdf13a6ee9a14fd6d8b41a5d522d5917e1fbc.tar.gz systemd-01efdf13a6ee9a14fd6d8b41a5d522d5917e1fbc.tar.bz2 systemd-01efdf13a6ee9a14fd6d8b41a5d522d5917e1fbc.zip | |
cgroup: certain cgroup attributes are not available in the root cgroup, hence don't bother
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/cgroup.c | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/src/core/cgroup.c b/src/core/cgroup.c index 50de02d0ce..1327486509 100644 --- a/src/core/cgroup.c +++ b/src/core/cgroup.c @@ -268,6 +268,7 @@ fail: } void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const char *path) { + bool is_root; int r; assert(c); @@ -276,7 +277,11 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha if (mask == 0) return; - if (mask & CGROUP_CPU) { + /* Some cgroup attributes are not support on the root cgroup, + * hence silently ignore */ + is_root = isempty(path) || path_equal(path, "/"); + + if ((mask & CGROUP_CPU) && !is_root) { char buf[DECIMAL_STR_MAX(unsigned long) + 1]; sprintf(buf, "%lu\n", c->cpu_shares); @@ -292,23 +297,25 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha CGroupBlockIODeviceWeight *w; CGroupBlockIODeviceBandwidth *b; - sprintf(buf, "%lu\n", c->blockio_weight); - r = cg_set_attribute("blkio", path, "blkio.weight", buf); - if (r < 0) - log_warning("Failed to set blkio.weight on %s: %s", path, strerror(-r)); + if (!is_root) { + sprintf(buf, "%lu\n", c->blockio_weight); + r = cg_set_attribute("blkio", path, "blkio.weight", buf); + if (r < 0) + log_warning("Failed to set blkio.weight on %s: %s", path, strerror(-r)); - /* FIXME: no way to reset this list */ - LIST_FOREACH(device_weights, w, c->blockio_device_weights) { - dev_t dev; + /* FIXME: no way to reset this list */ + LIST_FOREACH(device_weights, w, c->blockio_device_weights) { + dev_t dev; - r = lookup_blkio_device(w->path, &dev); - if (r < 0) - continue; + r = lookup_blkio_device(w->path, &dev); + if (r < 0) + continue; - sprintf(buf, "%u:%u %lu", major(dev), minor(dev), w->weight); - r = cg_set_attribute("blkio", path, "blkio.weight_device", buf); - if (r < 0) - log_error("Failed to set blkio.weight_device on %s: %s", path, strerror(-r)); + sprintf(buf, "%u:%u %lu", major(dev), minor(dev), w->weight); + r = cg_set_attribute("blkio", path, "blkio.weight_device", buf); + if (r < 0) + log_error("Failed to set blkio.weight_device on %s: %s", path, strerror(-r)); + } } /* FIXME: no way to reset this list */ @@ -342,7 +349,7 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha log_error("Failed to set memory.limit_in_bytes on %s: %s", path, strerror(-r)); } - if (mask & CGROUP_DEVICE) { + if ((mask & CGROUP_DEVICE) && !is_root) { CGroupDeviceAllow *a; if (c->device_allow || c->device_policy != CGROUP_AUTO) @@ -350,7 +357,7 @@ void cgroup_context_apply(CGroupContext *c, CGroupControllerMask mask, const cha else r = cg_set_attribute("devices", path, "devices.allow", "a"); if (r < 0) - log_error("Failed to reset devices.list on %s: %s", path, strerror(-r)); + log_warning("Failed to reset devices.list on %s: %s", path, strerror(-r)); if (c->device_policy == CGROUP_CLOSED || (c->device_policy == CGROUP_AUTO && c->device_allow)) { |