You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
30 lines
1.1 KiB
30 lines
1.1 KiB
8 months ago
|
From 8e1cc941607263a4f8454d0d6d5939aec3be1fcb Mon Sep 17 00:00:00 2001
|
||
|
|
From: David Tardon <dtardon@redhat.com>
|
||
|
|
Date: Tue, 23 Jun 2020 13:58:21 +0200
|
||
|
|
Subject: [PATCH] fix mis-merge
|
||
|
|
|
||
|
|
Resolves: #1848421
|
||
|
|
---
|
||
|
|
src/core/cgroup.c | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/src/core/cgroup.c b/src/core/cgroup.c
|
||
|
|
index 2d819b8ebb..e0eb184fd2 100644
|
||
|
|
--- a/src/core/cgroup.c
|
||
|
|
+++ b/src/core/cgroup.c
|
||
|
|
@@ -664,11 +664,13 @@ static void cgroup_apply_legacy_cpu_config(Unit *u, uint64_t shares, uint64_t qu
|
||
|
|
|
||
|
|
if (quota != USEC_INFINITY) {
|
||
|
|
xsprintf(buf, USEC_FMT "\n", MAX(quota * period / USEC_PER_SEC, USEC_PER_MSEC));
|
||
|
|
+ r = cg_set_attribute("cpu", u->cgroup_path, "cpu.cfs_quota_us", buf);
|
||
|
|
+ }
|
||
|
|
+ else
|
||
|
|
r = cg_set_attribute("cpu", u->cgroup_path, "cpu.cfs_quota_us", "-1");
|
||
|
|
if (r < 0)
|
||
|
|
log_unit_full(u, IN_SET(r, -ENOENT, -EROFS, -EACCES) ? LOG_DEBUG : LOG_WARNING, r,
|
||
|
|
"Failed to set cpu.cfs_quota_us: %m");
|
||
|
|
- }
|
||
|
|
}
|
||
|
|
|
||
|
|
static uint64_t cgroup_cpu_shares_to_weight(uint64_t shares) {
|