Skip to content

Commit 7002aa7

Browse files
committed
puts back reserved cpu set
1 parent ff7b29c commit 7002aa7

5 files changed

+16
-11
lines changed

modules/ztp-checking-du-cluster-config.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ You can check that clusters are running the correct configuration. The following
1818
1919
.Procedure
2020

21-
. Check that the default Operator Hub sources are disabled. Run the following command:
21+
. Check that the default OperatorHub sources are disabled. Run the following command:
2222
+
2323
[source,terminal]
2424
----
@@ -74,7 +74,7 @@ openshift-authentication-operator -- management
7474
+
7575
[IMPORTANT]
7676
====
77-
Additional Operators must not be annotated for workload partitioning. In the output from the previous command, additional Operators should be listed without any value on the right-hand side of the `--` separator.
77+
Additional Operators must not be annotated for workload partitioning. In the output from the previous command, additional Operators should be listed without any value on the right side of the `--` separator.
7878
====
7979

8080
. Check that the `ClusterLogging` configuration is correct. Run the following commands:
@@ -393,8 +393,8 @@ spec:
393393
- rcupdate.rcu_normal_after_boot=0
394394
- efi=runtime
395395
cpu:
396-
isolated: 4-103
397-
reserved: 0-3
396+
isolated: 2-51,54-103
397+
reserved: 0-1,52-53
398398
hugepages:
399399
defaultHugepagesSize: 1G
400400
pages:

modules/ztp-sno-du-enabling-workload-partitioning.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ include::snippets/ztp-02-master-workload-partitioning.adoc[leveloffset=+1]
2424
[crio.runtime.workloads.management]
2525
activation_annotation = "target.workload.openshift.io/management"
2626
annotation_prefix = "resources.workload.openshift.io"
27-
resources = { "cpushares" = 0, "cpuset" = "0-3" } <1>
27+
resources = { "cpushares" = 0, "cpuset" = "0-1,52-53" } <1>
2828
----
2929
<1> The `CPUs` value varies based on the installation.
3030
+
@@ -36,7 +36,7 @@ If Hyper-Threading is enabled, specify both threads for each core. The `CPUs` va
3636
----
3737
{
3838
"management": {
39-
"cpuset": "0-3" <1>
39+
"cpuset": "0-1,52-53" <1>
4040
}
4141
}
4242
----

snippets/ztp-02-master-workload-partitioning.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ spec:
1515
storage:
1616
files:
1717
- contents:
18-
source: data:text/plain;charset=utf-8;base64,W2NyaW8ucnVudGltZS53b3JrbG9hZHMubWFuYWdlbWVudF0KYWN0aXZhdGlvbl9hbm5vdGF0aW9uID0gInRhcmdldC53b3JrbG9hZC5vcGVuc2hpZnQuaW8vbWFuYWdlbWVudCIKYW5ub3RhdGlvbl9wcmVmaXggPSAicmVzb3VyY2VzLndvcmtsb2FkLm9wZW5zaGlmdC5pbyIKcmVzb3VyY2VzID0geyAiY3B1c2hhcmVzIiA9IDAsICJjcHVzZXQiID0gIjAtMyIgfQ==
18+
source: data:text/plain;charset=utf-8;base64,W2NyaW8ucnVudGltZS53b3JrbG9hZHMubWFuYWdlbWVudF0KYWN0aXZhdGlvbl9hbm5vdGF0aW9uID0gInRhcmdldC53b3JrbG9hZC5vcGVuc2hpZnQuaW8vbWFuYWdlbWVudCIKYW5ub3RhdGlvbl9wcmVmaXggPSAicmVzb3VyY2VzLndvcmtsb2FkLm9wZW5zaGlmdC5pbyIKcmVzb3VyY2VzID0geyAiY3B1c2hhcmVzIiA9IDAsICJjcHVzZXQiID0gIjAtMSw1Mi01MyIgfQo=
1919
mode: 420
2020
overwrite: true
2121
path: /etc/crio/crio.conf.d/01-workload-partitioning
2222
user:
2323
name: root
2424
- contents:
25-
source: data:text/plain;charset=utf-8;base64,ewogICJtYW5hZ2VtZW50IjogewogICAgImNwdXNldCI6ICIwLTMiCiAgfQp9
25+
source: data:text/plain;charset=utf-8;base64,ewogICJtYW5hZ2VtZW50IjogewogICAgImNwdXNldCI6ICIwLTEsNTItNTMiCiAgfQp9Cg==
2626
mode: 420
2727
overwrite: true
2828
path: /etc/kubernetes/openshift-workload-pinning

snippets/ztp-example-siteconfig.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ spec:
4343
bootMode: "UEFI" <10>
4444
rootDeviceHints:
4545
wwn: "0x11111000000asd123"
46-
cpuset: "0-3" <11>
46+
cpuset: "0-1,52-53" <11>
4747
nodeNetwork: <12>
4848
interfaces:
4949
- name: eno1

snippets/ztp-performance-profile.adoc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ spec:
1111
- rcupdate.rcu_normal_after_boot=0
1212
- "efi=runtime" <2>
1313
cpu:
14-
isolated: 4-103 <3>
15-
reserved: 0-3 <4>
14+
isolated: 2-51,54-103 <3>
15+
reserved: 0-1,52-53 <4>
1616
hugepages:
1717
defaultHugepagesSize: 1G
1818
pages:
@@ -30,6 +30,11 @@ spec:
3030
<1> Ensure that the value for `name` matches that specified in the `spec.profile.data` field of `TunedPerformancePatch.yaml` and the `status.configuration.source.name` field of `validatorCRs/informDuValidator.yaml`.
3131
<2> Configures UEFI secure boot for the cluster host.
3232
<3> Set the isolated CPUs. Ensure all of the Hyper-Threading pairs match.
33+
+
34+
[NOTE]
35+
====
36+
The reserved and isolated CPU pools must not overlap and together must span all available cores.
37+
====
3338
<4> Set the reserved CPUs. When workload partitioning is enabled, system processes, kernel threads, and system container threads are restricted to these CPUs. All CPUs that are not isolated should be reserved.
3439
<5> Set the number of huge pages.
3540
<6> Set the huge page size.

0 commit comments

Comments
 (0)