Skip to content
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

Jump to bottom

OCPBUGS-3407 - Workload partitioning wrong CRI-O configuration key #53510

Merged
merged 1 commit into from Dec 8, 2022
Merged

OCPBUGS-3407 - Workload partitioning wrong CRI-O configuration key #53510

merged 1 commit into from Dec 8, 2022

Conversation

rohennes
Copy link
Contributor

@rohennes rohennes commented Dec 6, 2022 •
edited

OCPBUGS-3407: There was an incorrect parameter (CPU vs cpuset) in a previous documentation update. The module has been updated since the bug was created, so CPU was not present but the formatting seemed different to the schema. So I updated the yaml to match the schema. And also changed the numbered callout from CPU to cpuset

Version(s):
4.9+

Issue:
https://issues.redhat.com/browse/OCPBUGS-3407

Link to docs preview:
http://file.emea.redhat.com/rohennes/OCPBUGS-3407-workload-partitionin-yaml/scalability_and_performance/sno-du-enabling-workload-partitioning-on-single-node-openshift.html

QE review:

  • QE has approved this change.

Additional information:

@rohennes
Copy link
Contributor Author

rohennes commented Dec 6, 2022

/label telco

@openshift-ci openshift-ci bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. telco Label for all Telco PRs labels Dec 6, 2022
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Dec 6, 2022 •
edited

🤖 Updated build preview is available at:
https://53510--docspreview.netlify.app

Build log: https://circleci.com/gh/ocpdocs-previewbot/openshift-docs/4765

@mrniranjan
Copy link

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 7, 2022
@rohennes rohennes force-pushed the OCPBUGS-3407-workload-partitionin-yaml branch from bdaf500 to 091c862 Compare December 7, 2022 11:17
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 7, 2022
@rohennes rohennes force-pushed the OCPBUGS-3407-workload-partitionin-yaml branch from 091c862 to 3983d5b Compare December 7, 2022 11:35
@openshift-ci openshift-ci bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 7, 2022
eggfoobar
eggfoobar reviewed Dec 7, 2022
View reviewed changes
modules/sno-du-enabling-workload-partitioning.adoc Outdated
----
<1> The `CPUs` value varies based on the installation.
<1> The `cpuset` value varies based on the installation.
+
If Hyper-Threading is enabled, specify both threads for each core. The `CPUs` value must match the reserved CPU set specified in the performance profile.
Copy link
Contributor

@eggfoobar eggfoobar Dec 7, 2022 •
edited

Choose a reason for hiding this comment

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

Does this also need a change CPUs -> cpuset? Also, I think we should highlight the word reserved if we mean to reference the reserved field in the performance profile so it's clear we mean that field.

@rohennes rohennes force-pushed the OCPBUGS-3407-workload-partitionin-yaml branch from 3983d5b to 4d6d4b9 Compare December 7, 2022 15:03
@rohennes rohennes force-pushed the OCPBUGS-3407-workload-partitionin-yaml branch from 4d6d4b9 to edd8991 Compare December 7, 2022 15:14
@rohennes
Copy link
Contributor Author

rohennes commented Dec 7, 2022

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Dec 7, 2022
@eggfoobar
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 7, 2022
@tmalove
Copy link
Contributor

tmalove commented Dec 7, 2022

/remove-label peer-review-needed
/label peer-review-in-progress

@openshift-ci openshift-ci bot added peer-review-in-progress Signifies that the peer review team is reviewing this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Dec 7, 2022
@tmalove
Copy link
Contributor

tmalove commented Dec 7, 2022

/remove-label peer-review-in-progress
/label peer-review-done
/LGTM

@openshift-ci openshift-ci bot added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR labels Dec 7, 2022
@rohennes
Copy link
Contributor Author

rohennes commented Dec 8, 2022

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Dec 8, 2022
@mjpytlak mjpytlak added merge-review-in-progress Signifies that the merge review team is reviewing this PR branch/enterprise-4.9 branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 and removed merge-review-needed Signifies that the merge review team needs to review this PR labels Dec 8, 2022
@mjpytlak mjpytlak added this to the Continuous Release milestone Dec 8, 2022
@mjpytlak mjpytlak merged commit a2a3c1e into openshift:main Dec 8, 2022
@mjpytlak
Copy link
Contributor

mjpytlak commented Dec 8, 2022

/cherrypick enterprise-4.12

@mjpytlak
Copy link
Contributor

mjpytlak commented Dec 8, 2022

/cherrypick enterprise-4.11

@mjpytlak
Copy link
Contributor

mjpytlak commented Dec 8, 2022

/cherrypick enterprise-4.10

@mjpytlak
Copy link
Contributor

mjpytlak commented Dec 8, 2022

/cherrypick enterprise-4.9

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 8, 2022
Merged
@openshift-cherrypick-robot
Copy link

@mjpytlak: new pull request created: #53602

In response to this:

/cherrypick enterprise-4.12

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 8, 2022
Merged
@openshift-cherrypick-robot
Copy link

@mjpytlak: new pull request created: #53603

In response to this:

/cherrypick enterprise-4.11

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 8, 2022
Merged
@openshift-cherrypick-robot
Copy link

@mjpytlak: new pull request created: #53604

In response to this:

/cherrypick enterprise-4.10

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot
Copy link

@mjpytlak: #53510 failed to apply on top of branch "enterprise-4.9":

Applying: Fixing cpuset
Using index info to reconstruct a base tree...
M	modules/sno-du-enabling-workload-partitioning.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/sno-du-enabling-workload-partitioning.adoc
CONFLICT (content): Merge conflict in modules/sno-du-enabling-workload-partitioning.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fixing cpuset
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".

In response to this:

/cherrypick enterprise-4.9

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@mjpytlak
Copy link
Contributor

mjpytlak commented Dec 8, 2022

@rohennes Got a conflict 4.9. PTAL. I will merge up the rest of branches.

@rohennes rohennes mentioned this pull request Dec 9, 2022
Merged
1 task
@rohennes
Copy link
Contributor Author

rohennes commented Dec 9, 2022

@rohennes Got a conflict 4.9. PTAL. I will merge up the rest of branches.

See the manual CP PR with resolved conflicts @mjpytlak - thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eggfoobar eggfoobar eggfoobar left review comments

Assignees

@mrniranjan mrniranjan

@eggfoobar eggfoobar

@tmalove tmalove

Labels
branch/enterprise-4.9 branch/enterprise-4.10 branch/enterprise-4.11 branch/enterprise-4.12 lgtm Indicates that a PR is ready to be merged. merge-review-in-progress Signifies that the merge review team is reviewing this PR peer-review-done Signifies that the peer review team has reviewed this PR size/S Denotes a PR that changes 10-29 lines, ignoring generated files. telco Label for all Telco PRs
Projects
None yet
Milestone
Continuous Release
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@rohennes @ocpdocs-previewbot @mrniranjan @eggfoobar @tmalove @mjpytlak @openshift-cherrypick-robot