Skip to content

OCPBUGS-83865: Revert stalld backend to sched_debug #1515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bartwensley wants to merge 1 commit into
base: main
Choose a base branch
from
Open

OCPBUGS-83865: Revert stalld backend to sched_debug #1515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions ...erformanceprofile/controller/performanceprofile/components/machineconfig/machineconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,16 @@ func getIgnitionConfig(profile *performancev2.PerformanceProfile, opts *componen
addContent(ignitionConfig, content, ovsDynamicPinningTriggerHostFile, &ovsMode)
}

// Configure a systemd dropin and sysconfig file so stalld uses sched_debug as its backend.
// The dropin has no effect if stalld is not running, so it is safe to include unconditionally.
// This can potentially be removed when RHEL-175242 is fixed.
stalldSysconfigContent := []byte("BE=\"-b sched_debug\"\n")
stalldSysconfigMode := 0644
addContent(ignitionConfig, stalldSysconfigContent, "/etc/sysconfig/stalld-backend", &stalldSysconfigMode)

stalldDropinContent := []byte("[Service]\nEnvironmentFile=/etc/sysconfig/stalld-backend\n")
addContent(ignitionConfig, stalldDropinContent, "/etc/systemd/system/stalld.service.d/stalld-backend.conf", &stalldSysconfigMode)

if opts.MixedCPUsEnabled {
// ContainersLimit should be exposed as user-facing API in future updates
content, err := renderMixedCPUsConfig(defaultContainersLimit, filepath.Join("configs", mixedCPUsConfig))
Expand Down
24 changes: 24 additions & 0 deletions ...manceprofile/controller/performanceprofile/components/machineconfig/machineconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,30 @@ var _ = Describe("Machine Config", func() {
})
})

Context("stalld backend configuration", func() {
It("should include stalld sysconfig and systemd dropin files", func() {
Copy link
Copy Markdown
Contributor

@MarSik MarSik May 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is checking the files, but not whether systemd consumed them. You should probably add an e2e test too that makes sure systemd noticed the files. See https://github.com/openshift/cluster-node-tuning-operator/blob/main/test/e2e/performanceprofile/functests/utils/systemd/systemd.go#L17 for helper functions. And probably place the test somewhere here https://github.com/openshift/cluster-node-tuning-operator/blob/main/test/e2e/performanceprofile/functests/1_performance/performance.go

Copy link
Copy Markdown
Contributor Author

@bartwensley bartwensley May 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a new e2e test as you requested.

profile := testutils.NewPerformanceProfile("test")

mc, err := New(profile, &components.MachineConfigOptions{})
Expect(err).ToNot(HaveOccurred())

result := igntypes.Config{}
Expect(json.Unmarshal(mc.Spec.Config.Raw, &result)).To(Succeed())

fileContents := map[string]string{}
for _, f := range result.Storage.Files {
Expect(f.Contents.Source).ToNot(BeNil(), "file %s has nil source", f.Path)
base64Data := strings.TrimPrefix(*f.Contents.Source, "data:text/plain;charset=utf-8;base64,")
decoded, err := base64.StdEncoding.DecodeString(base64Data)
Expect(err).ToNot(HaveOccurred())
Comment thread
coderabbitai[bot] marked this conversation as resolved.
fileContents[f.Path] = string(decoded)
}

Expect(fileContents).To(HaveKeyWithValue("/etc/sysconfig/stalld-backend", "BE=\"-b sched_debug\"\n"))
Expect(fileContents).To(HaveKeyWithValue("/etc/systemd/system/stalld.service.d/stalld-backend.conf", "[Service]\nEnvironmentFile=/etc/sysconfig/stalld-backend\n"))
})
})

Context("check listToString ", func() {
It("should create string from CPUSet", func() {
res := components.ListToString(CPUs)
Expand Down
16 changes: 16 additions & 0 deletions test/e2e/performanceprofile/functests/1_performance/performance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,22 @@ var _ = Describe("[rfe_id:27368][performance]", Ordered, func() {
Expect(tunedExitTime).To(BeNumerically("<", kubeletStartTime), "kubelet started before ocp-tuned-one-shot.service exits")
}
})

It("Should have the stalld service configured with the stalld-backend drop-in", func() {
for _, node := range workerRTNodes {
By("verify that the stalld systemd unit has the stalld-backend drop-in path")
out, err := systemd.ShowProperty(context.TODO(), "stalld.service", "DropInPaths", &node)
Expect(err).ToNot(HaveOccurred())
Expect(out).To(ContainSubstring("/etc/systemd/system/stalld.service.d/stalld-backend.conf"),
"stalld.service on node %s does not have the stalld-backend.conf drop-in: %s", node.Name, out)

By("verify that the stalld systemd unit has the stalld-backend environment file")
out, err = systemd.ShowProperty(context.TODO(), "stalld.service", "EnvironmentFiles", &node)
Expect(err).ToNot(HaveOccurred())
Expect(out).To(ContainSubstring("/etc/sysconfig/stalld-backend"),
"stalld.service on node %s does not have /etc/sysconfig/stalld-backend in EnvironmentFiles: %s", node.Name, out)
}
})
})

Context("Tuned kernel parameters", Label(string(label.Tier0)), func() {
Expand Down
14 changes: 14 additions & 0 deletions .../render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-master_machineconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,20 @@ spec:
mode: 420
path: /var/lib/ovn-ic/etc/enable_dynamic_cpu_affinity
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,QkU9Ii1iIHNjaGVkX2RlYnVnIgo=
verification: {}
group: {}
mode: 420
path: /etc/sysconfig/stalld-backend
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,W1NlcnZpY2VdCkVudmlyb25tZW50RmlsZT0vZXRjL3N5c2NvbmZpZy9zdGFsbGQtYmFja2VuZAo=
verification: {}
group: {}
mode: 420
path: /etc/systemd/system/stalld.service.d/stalld-backend.conf
user: {}
systemd:
units:
- contents: |
Expand Down
14 changes: 14 additions & 0 deletions .../render-expected-output/bootstrap/extra-mcp/openshift-bootstrap-worker_machineconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,20 @@ spec:
mode: 420
path: /var/lib/ovn-ic/etc/enable_dynamic_cpu_affinity
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,QkU9Ii1iIHNjaGVkX2RlYnVnIgo=
verification: {}
group: {}
mode: 420
path: /etc/sysconfig/stalld-backend
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,W1NlcnZpY2VdCkVudmlyb25tZW50RmlsZT0vZXRjL3N5c2NvbmZpZy9zdGFsbGQtYmFja2VuZAo=
verification: {}
group: {}
mode: 420
path: /etc/systemd/system/stalld.service.d/stalld-backend.conf
user: {}
systemd:
units:
- contents: |
Expand Down
14 changes: 14 additions & 0 deletions ...ata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-master_machineconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,20 @@ spec:
mode: 420
path: /var/lib/ovn-ic/etc/enable_dynamic_cpu_affinity
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,QkU9Ii1iIHNjaGVkX2RlYnVnIgo=
verification: {}
group: {}
mode: 420
path: /etc/sysconfig/stalld-backend
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,W1NlcnZpY2VdCkVudmlyb25tZW50RmlsZT0vZXRjL3N5c2NvbmZpZy9zdGFsbGQtYmFja2VuZAo=
verification: {}
group: {}
mode: 420
path: /etc/systemd/system/stalld.service.d/stalld-backend.conf
user: {}
systemd:
units:
- contents: |
Expand Down
14 changes: 14 additions & 0 deletions ...ata/render-expected-output/bootstrap/no-mcp/openshift-bootstrap-worker_machineconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,20 @@ spec:
mode: 420
path: /var/lib/ovn-ic/etc/enable_dynamic_cpu_affinity
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,QkU9Ii1iIHNjaGVkX2RlYnVnIgo=
verification: {}
group: {}
mode: 420
path: /etc/sysconfig/stalld-backend
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,W1NlcnZpY2VdCkVudmlyb25tZW50RmlsZT0vZXRjL3N5c2NvbmZpZy9zdGFsbGQtYmFja2VuZAo=
verification: {}
group: {}
mode: 420
path: /etc/systemd/system/stalld.service.d/stalld-backend.conf
user: {}
systemd:
units:
- contents: |
Expand Down
14 changes: 14 additions & 0 deletions .../performanceprofile/testdata/render-expected-output/default/arm/manual_machineconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,20 @@ spec:
mode: 420
path: /var/lib/ovn-ic/etc/enable_dynamic_cpu_affinity
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,QkU9Ii1iIHNjaGVkX2RlYnVnIgo=
verification: {}
group: {}
mode: 420
path: /etc/sysconfig/stalld-backend
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,W1NlcnZpY2VdCkVudmlyb25tZW50RmlsZT0vZXRjL3N5c2NvbmZpZy9zdGFsbGQtYmFja2VuZAo=
verification: {}
group: {}
mode: 420
path: /etc/systemd/system/stalld.service.d/stalld-backend.conf
user: {}
systemd:
units:
- contents: |
Expand Down
14 changes: 14 additions & 0 deletions ...nceprofile/testdata/render-expected-output/default/cpuFrequency/manual_machineconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,20 @@ spec:
mode: 420
path: /var/lib/ovn-ic/etc/enable_dynamic_cpu_affinity
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,QkU9Ii1iIHNjaGVkX2RlYnVnIgo=
verification: {}
group: {}
mode: 420
path: /etc/sysconfig/stalld-backend
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,W1NlcnZpY2VdCkVudmlyb25tZW50RmlsZT0vZXRjL3N5c2NvbmZpZy9zdGFsbGQtYmFja2VuZAo=
verification: {}
group: {}
mode: 420
path: /etc/systemd/system/stalld.service.d/stalld-backend.conf
user: {}
systemd:
units:
- contents: |
Expand Down
14 changes: 14 additions & 0 deletions .../e2e/performanceprofile/testdata/render-expected-output/default/manual_machineconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,20 @@ spec:
mode: 420
path: /var/lib/ovn-ic/etc/enable_dynamic_cpu_affinity
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,QkU9Ii1iIHNjaGVkX2RlYnVnIgo=
verification: {}
group: {}
mode: 420
path: /etc/sysconfig/stalld-backend
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,W1NlcnZpY2VdCkVudmlyb25tZW50RmlsZT0vZXRjL3N5c2NvbmZpZy9zdGFsbGQtYmFja2VuZAo=
verification: {}
group: {}
mode: 420
path: /etc/systemd/system/stalld.service.d/stalld-backend.conf
user: {}
systemd:
units:
- contents: |
Expand Down
14 changes: 14 additions & 0 deletions ...ormanceprofile/testdata/render-expected-output/default/pp-norps/manual_machineconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,20 @@ spec:
mode: 420
path: /var/lib/ovn-ic/etc/enable_dynamic_cpu_affinity
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,QkU9Ii1iIHNjaGVkX2RlYnVnIgo=
verification: {}
group: {}
mode: 420
path: /etc/sysconfig/stalld-backend
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,W1NlcnZpY2VdCkVudmlyb25tZW50RmlsZT0vZXRjL3N5c2NvbmZpZy9zdGFsbGQtYmFja2VuZAo=
verification: {}
group: {}
mode: 420
path: /etc/systemd/system/stalld.service.d/stalld-backend.conf
user: {}
systemd:
units:
- contents: |
Expand Down
14 changes: 14 additions & 0 deletions test/e2e/performanceprofile/testdata/render-expected-output/manual_machineconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,20 @@ spec:
mode: 420
path: /var/lib/ovn-ic/etc/enable_dynamic_cpu_affinity
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,QkU9Ii1iIHNjaGVkX2RlYnVnIgo=
verification: {}
group: {}
mode: 420
path: /etc/sysconfig/stalld-backend
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,W1NlcnZpY2VdCkVudmlyb25tZW50RmlsZT0vZXRjL3N5c2NvbmZpZy9zdGFsbGQtYmFja2VuZAo=
verification: {}
group: {}
mode: 420
path: /etc/systemd/system/stalld.service.d/stalld-backend.conf
user: {}
systemd:
units:
- contents: |
Expand Down
14 changes: 14 additions & 0 deletions test/e2e/performanceprofile/testdata/render-expected-output/no-ref/manual_machineconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,20 @@ spec:
mode: 420
path: /var/lib/ovn-ic/etc/enable_dynamic_cpu_affinity
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,QkU9Ii1iIHNjaGVkX2RlYnVnIgo=
verification: {}
group: {}
mode: 420
path: /etc/sysconfig/stalld-backend
user: {}
- contents:
source: data:text/plain;charset=utf-8;base64,W1NlcnZpY2VdCkVudmlyb25tZW50RmlsZT0vZXRjL3N5c2NvbmZpZy9zdGFsbGQtYmFja2VuZAo=
verification: {}
group: {}
mode: 420
path: /etc/systemd/system/stalld.service.d/stalld-backend.conf
user: {}
systemd:
units:
- contents: |
Expand Down