Systemd processes not being moved to cpuset/systemd.slice fix

The script cpuset-configure.sh is responsible to move the systemd processes to the cpuset/systemd.slice cgroup and is executed in a form of a service (cpuset-configure.service). In the current implementation, the script is executed too early - some system processes are yet to be created. This in turn leads to them not being moved to the custom system slice. Moreover, in the current implementation, the script is executed before the network-online.target. The intention was to execute the script before kubelet and crio services are initialized, by the fact network-online.target is a common parent. The fix I'm proposing consist of the following changes: 1. Adding an After statements - The script will start once the late starting processes as NetworkManager, sshd, etc... are started. Thereby we can ensure processes as such do not fall between the cracks. 2. Narrowing down the Before statement to a more accurate one, reflecting its original intention. Signed-off-by: Ronny Baturov <rbaturov@redhat.com>
openshift · Mar 17, 2024 · a04faf5 · a04faf5
1 parent eb35a4e
commit a04faf5
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 18 deletions.
diff --git a/...erformanceprofile/controller/performanceprofile/components/machineconfig/machineconfig.go b/...erformanceprofile/controller/performanceprofile/components/machineconfig/machineconfig.go
@@ -80,6 +80,7 @@ const (
 	systemdSectionInstall  = "Install"
 	systemdDescription     = "Description"
 	systemdBefore          = "Before"
+	systemdAfter           = "After"
 	systemdEnvironment     = "Environment"
 	systemdType            = "Type"
 	systemdRemainAfterExit = "RemainAfterExit"
@@ -88,13 +89,17 @@ const (
 )
 
 const (
-	systemdServiceIRQBalance   = "irqbalance.service"
-	systemdServiceKubelet      = "kubelet.service"
-	systemdServiceCrio         = "crio.service"
-	systemdServiceTypeOneshot  = "oneshot"
-	systemdTargetMultiUser     = "multi-user.target"
-	systemdTargetNetworkOnline = "network-online.target"
-	systemdTrue                = "true"
+	systemdServiceIRQBalance     = "irqbalance.service"
+	systemdServiceKubelet        = "kubelet.service"
+	systemdServiceCrio           = "crio.service"
+	systemdServiceTypeOneshot    = "oneshot"
+	systemdTargetMultiUser       = "multi-user.target"
+	systemdTrue                  = "true"
+	systemdServiceNetworkManager = "NetworkManager.service"
+	systemdServiceSSHD           = "sshd.service"
+	systemdServiceDnsmasq        = "dnsmasq.service"
+	systemdServiceDbusBroker     = "dbus-broker.service"
+	systemdServiceGetty          = "getty@tty1.service.service"
 )
 
 const (
@@ -451,7 +456,14 @@ func getCpusetConfigureServiceOptions() []*unit.UnitOption {
 		// Description
 		unit.NewUnitOption(systemdSectionUnit, systemdDescription, "Move services to reserved cpuset"),
 		// Before
-		unit.NewUnitOption(systemdSectionUnit, systemdBefore, systemdTargetNetworkOnline),
+		unit.NewUnitOption(systemdSectionUnit, systemdBefore, systemdServiceKubelet),
+		unit.NewUnitOption(systemdSectionUnit, systemdBefore, systemdServiceCrio),
+		// After
+		unit.NewUnitOption(systemdSectionUnit, systemdAfter, systemdServiceNetworkManager),
+		unit.NewUnitOption(systemdSectionUnit, systemdAfter, systemdServiceSSHD),
+		unit.NewUnitOption(systemdSectionUnit, systemdAfter, systemdServiceDnsmasq),
+		unit.NewUnitOption(systemdSectionUnit, systemdAfter, systemdServiceDbusBroker),
+		unit.NewUnitOption(systemdSectionUnit, systemdAfter, systemdServiceGetty),
 		// Type
 		unit.NewUnitOption(systemdSectionService, systemdType, systemdServiceTypeOneshot),
 		// ExecStart

diff --git a/...nder-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-master_machineconfig.yaml b/...nder-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-master_machineconfig.yaml
@@ -139,7 +139,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot

diff --git a/...nder-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-worker_machineconfig.yaml b/...nder-expected-output/bootstrap/extra-ctrcfg/openshift-bootstrap-worker_machineconfig.yaml
@@ -139,7 +139,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot

diff --git a/.../render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_machineconfig.yaml b/.../render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_machineconfig.yaml
@@ -139,7 +139,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot

diff --git a/.../render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_machineconfig.yaml b/.../render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_machineconfig.yaml
@@ -139,7 +139,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot

diff --git a/...ata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_machineconfig.yaml b/...ata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_machineconfig.yaml
@@ -139,7 +139,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot

diff --git a/...ata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_machineconfig.yaml b/...ata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_machineconfig.yaml
@@ -139,7 +139,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot

diff --git a/...nceprofile/testdata/render-expected-output/default/cpuFrequency/manual_machineconfig.yaml b/...nceprofile/testdata/render-expected-output/default/cpuFrequency/manual_machineconfig.yaml
@@ -141,7 +141,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot

diff --git a/.../e2e/performanceprofile/testdata/render-expected-output/default/manual_machineconfig.yaml b/.../e2e/performanceprofile/testdata/render-expected-output/default/manual_machineconfig.yaml
@@ -142,7 +142,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot

diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/manual_machineconfig.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/manual_machineconfig.yaml
@@ -146,7 +146,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot

diff --git a/test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_machineconfig.yaml b/test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_machineconfig.yaml
@@ -141,7 +141,13 @@ spec:
       - contents: |
           [Unit]
           Description=Move services to reserved cpuset
-          Before=network-online.target
+          Before=kubelet.service
+          Before=crio.service
+          After=NetworkManager.service
+          After=sshd.service
+          After=dnsmasq.service
+          After=dbus-broker.service
+          After=getty@tty1.service.service
 
           [Service]
           Type=oneshot