77 lines
2.3 KiB
Diff
77 lines
2.3 KiB
Diff
|
From a540b3e604d921200ee35f859770c9fbed6b669a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michal Sekletar <msekleta@redhat.com>
|
||
|
|
Date: Fri, 3 Mar 2023 10:58:37 +0100
|
||
|
|
Subject: [PATCH] Revert "user: delegate cpu controller, assign weights to user
|
||
|
|
slices"
|
||
|
|
|
||
|
|
This reverts commit b8df7f8629cb310beac982a4779b27eabe5362c6.
|
||
|
|
|
||
|
|
Resolves: #2173996
|
||
|
|
---
|
||
|
|
TODO | 2 --
|
||
|
|
units/user/app.slice | 3 ---
|
||
|
|
units/user/background.slice | 3 ---
|
||
|
|
units/user/session.slice | 3 ---
|
||
|
|
units/user@.service.in | 2 +-
|
||
|
|
5 files changed, 1 insertion(+), 12 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/TODO b/TODO
|
||
|
|
index 560ec4bca4..66c008bff3 100644
|
||
|
|
--- a/TODO
|
||
|
|
+++ b/TODO
|
||
|
|
@@ -1662,8 +1662,6 @@ Features:
|
||
|
|
- when reloading configuration, apply new cgroup configuration
|
||
|
|
- when recursively showing the cgroup hierarchy, optionally also show
|
||
|
|
the hierarchies of child processes
|
||
|
|
-- add settings for cgroup.max.descendants and cgroup.max.depth,
|
||
|
|
- maybe use them for user@.service
|
||
|
|
|
||
|
|
* transient units:
|
||
|
|
- add field to transient units that indicate whether systemd or somebody else saves/restores its settings, for integration with libvirt
|
||
|
|
diff --git a/units/user/app.slice b/units/user/app.slice
|
||
|
|
index eac50645a4..0c73135e17 100644
|
||
|
|
--- a/units/user/app.slice
|
||
|
|
+++ b/units/user/app.slice
|
||
|
|
@@ -10,6 +10,3 @@
|
||
|
|
[Unit]
|
||
|
|
Description=User Application Slice
|
||
|
|
Documentation=man:systemd.special(7)
|
||
|
|
-
|
||
|
|
-[Slice]
|
||
|
|
-CPUWeight=100
|
||
|
|
diff --git a/units/user/background.slice b/units/user/background.slice
|
||
|
|
index a9767753b3..8f2a0949bd 100644
|
||
|
|
--- a/units/user/background.slice
|
||
|
|
+++ b/units/user/background.slice
|
||
|
|
@@ -10,6 +10,3 @@
|
||
|
|
[Unit]
|
||
|
|
Description=User Background Tasks Slice
|
||
|
|
Documentation=man:systemd.special(7)
|
||
|
|
-
|
||
|
|
-[Slice]
|
||
|
|
-CPUWeight=30
|
||
|
|
diff --git a/units/user/session.slice b/units/user/session.slice
|
||
|
|
index aa12b7d03c..3d99d51bc5 100644
|
||
|
|
--- a/units/user/session.slice
|
||
|
|
+++ b/units/user/session.slice
|
||
|
|
@@ -10,6 +10,3 @@
|
||
|
|
[Unit]
|
||
|
|
Description=User Core Session Slice
|
||
|
|
Documentation=man:systemd.special(7)
|
||
|
|
-
|
||
|
|
-[Slice]
|
||
|
|
-CPUWeight=100
|
||
|
|
diff --git a/units/user@.service.in b/units/user@.service.in
|
||
|
|
index 1660de0326..efbd5dfbc8 100644
|
||
|
|
--- a/units/user@.service.in
|
||
|
|
+++ b/units/user@.service.in
|
||
|
|
@@ -21,7 +21,7 @@ Type=notify
|
||
|
|
ExecStart={{ROOTLIBEXECDIR}}/systemd --user
|
||
|
|
Slice=user-%i.slice
|
||
|
|
KillMode=mixed
|
||
|
|
-Delegate=pids memory cpu
|
||
|
|
+Delegate=pids memory
|
||
|
|
TasksMax=infinity
|
||
|
|
TimeoutStopSec=120s
|
||
|
|
KeyringMode=inherit
|