Closed rbaturov closed 9 months ago
@rbaturov: This pull request references Jira Issue OCPBUGS-23167, which is invalid:
Comment /jira refresh
to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.
The bug has been updated to refer to the pull request using the external bug tracker.
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: MarSik, rbaturov
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/jira refresh
@MarSik: This pull request references Jira Issue OCPBUGS-23167, which is valid. The bug has been moved to the POST state.
No GitHub users were found matching the public email listed for the QA contact in Jira (mniranja@redhat.com), skipping review request.
/unhold
@rbaturov: all tests passed!
Full PR test history. Your PR dashboard.
@rbaturov: Jira Issue OCPBUGS-23167: All pull requests linked via external trackers have merged:
Jira Issue OCPBUGS-23167 has been moved to the MODIFIED state.
/cherry-pick release-4.15
@yanirq: #954 failed to apply on top of branch "release-4.15":
Applying: Add performance real time tuned template
.git/rebase-apply/patch:49: trailing whitespace.
#The openshift-node-performance profile inherits these kernel parameters from the network-latency profile.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M assets/performanceprofile/tuned/openshift-node-performance
M pkg/performanceprofile/controller/performanceprofile/components/tuned/tuned.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/performanceprofile/controller/performanceprofile/components/tuned/tuned.go
CONFLICT (content): Merge conflict in pkg/performanceprofile/controller/performanceprofile/components/tuned/tuned.go
Auto-merging assets/performanceprofile/tuned/openshift-node-performance
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add performance real time tuned template
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
[ART PR BUILD NOTIFIER]
This PR has been included in build cluster-node-tuning-operator-container-v4.16.0-202402211939.p0.g19686cd.assembly.stream.el9 for distgit cluster-node-tuning-operator. All builds following this will include this PR.
Fix included in accepted release 4.16.0-0.nightly-2024-02-22-021321
/cherry-pick release-4.15
@rbaturov: #954 failed to apply on top of branch "release-4.15":
Applying: Add performance real time tuned template
.git/rebase-apply/patch:49: trailing whitespace.
#The openshift-node-performance profile inherits these kernel parameters from the network-latency profile.
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M assets/performanceprofile/tuned/openshift-node-performance
M pkg/performanceprofile/controller/performanceprofile/components/tuned/tuned.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/performanceprofile/controller/performanceprofile/components/tuned/tuned.go
CONFLICT (content): Merge conflict in pkg/performanceprofile/controller/performanceprofile/components/tuned/tuned.go
Auto-merging assets/performanceprofile/tuned/openshift-node-performance
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add performance real time tuned template
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Kernel parameters that are not supported on RT kernel systems are being applied, causing errors to be logged to the tuned daemon, resulting in a degraded profile state. Therefore, I added the openshift-node-performance-rt profile that would be included if an RT kernel is detected, thereby dropping the unsupported kernel parameters before they are applied.