diff --git a/modules/ztp-checking-du-cluster-config.adoc b/modules/ztp-checking-du-cluster-config.adoc index 21b53881db..2bc29683b9 100644 --- a/modules/ztp-checking-du-cluster-config.adoc +++ b/modules/ztp-checking-du-cluster-config.adoc @@ -18,7 +18,7 @@ You can check that clusters are running the correct configuration. The following .Procedure -. Check that the default Operator Hub sources are disabled. Run the following command: +. Check that the default OperatorHub sources are disabled. Run the following command: + [source,terminal] ---- @@ -74,7 +74,7 @@ openshift-authentication-operator -- management + [IMPORTANT] ==== -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. +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. ==== . Check that the `ClusterLogging` configuration is correct. Run the following commands: @@ -393,8 +393,8 @@ spec: - rcupdate.rcu_normal_after_boot=0 - efi=runtime cpu: - isolated: 4-103 - reserved: 0-3 + isolated: 2-51,54-103 + reserved: 0-1,52-53 hugepages: defaultHugepagesSize: 1G pages: diff --git a/modules/ztp-sno-du-enabling-workload-partitioning.adoc b/modules/ztp-sno-du-enabling-workload-partitioning.adoc index 9f887fb536..9d7663a771 100644 --- a/modules/ztp-sno-du-enabling-workload-partitioning.adoc +++ b/modules/ztp-sno-du-enabling-workload-partitioning.adoc @@ -24,7 +24,7 @@ include::snippets/ztp-02-master-workload-partitioning.adoc[leveloffset=+1] [crio.runtime.workloads.management] activation_annotation = "target.workload.openshift.io/management" annotation_prefix = "resources.workload.openshift.io" -resources = { "cpushares" = 0, "cpuset" = "0-3" } <1> +resources = { "cpushares" = 0, "cpuset" = "0-1,52-53" } <1> ---- <1> The `CPUs` value varies based on the installation. + @@ -36,7 +36,7 @@ If Hyper-Threading is enabled, specify both threads for each core. The `CPUs` va ---- { "management": { - "cpuset": "0-3" <1> + "cpuset": "0-1,52-53" <1> } } ---- diff --git a/snippets/ztp-02-master-workload-partitioning.adoc b/snippets/ztp-02-master-workload-partitioning.adoc index b87f1c0503..58f26e1454 100644 --- a/snippets/ztp-02-master-workload-partitioning.adoc +++ b/snippets/ztp-02-master-workload-partitioning.adoc @@ -15,14 +15,14 @@ spec: storage: files: - contents: - source: data:text/plain;charset=utf-8;base64,W2NyaW8ucnVudGltZS53b3JrbG9hZHMubWFuYWdlbWVudF0KYWN0aXZhdGlvbl9hbm5vdGF0aW9uID0gInRhcmdldC53b3JrbG9hZC5vcGVuc2hpZnQuaW8vbWFuYWdlbWVudCIKYW5ub3RhdGlvbl9wcmVmaXggPSAicmVzb3VyY2VzLndvcmtsb2FkLm9wZW5zaGlmdC5pbyIKcmVzb3VyY2VzID0geyAiY3B1c2hhcmVzIiA9IDAsICJjcHVzZXQiID0gIjAtMyIgfQ== + source: data:text/plain;charset=utf-8;base64,W2NyaW8ucnVudGltZS53b3JrbG9hZHMubWFuYWdlbWVudF0KYWN0aXZhdGlvbl9hbm5vdGF0aW9uID0gInRhcmdldC53b3JrbG9hZC5vcGVuc2hpZnQuaW8vbWFuYWdlbWVudCIKYW5ub3RhdGlvbl9wcmVmaXggPSAicmVzb3VyY2VzLndvcmtsb2FkLm9wZW5zaGlmdC5pbyIKcmVzb3VyY2VzID0geyAiY3B1c2hhcmVzIiA9IDAsICJjcHVzZXQiID0gIjAtMSw1Mi01MyIgfQo= mode: 420 overwrite: true path: /etc/crio/crio.conf.d/01-workload-partitioning user: name: root - contents: - source: data:text/plain;charset=utf-8;base64,ewogICJtYW5hZ2VtZW50IjogewogICAgImNwdXNldCI6ICIwLTMiCiAgfQp9 + source: data:text/plain;charset=utf-8;base64,ewogICJtYW5hZ2VtZW50IjogewogICAgImNwdXNldCI6ICIwLTEsNTItNTMiCiAgfQp9Cg== mode: 420 overwrite: true path: /etc/kubernetes/openshift-workload-pinning diff --git a/snippets/ztp-example-siteconfig.adoc b/snippets/ztp-example-siteconfig.adoc index c9a18889b9..f935c639e3 100644 --- a/snippets/ztp-example-siteconfig.adoc +++ b/snippets/ztp-example-siteconfig.adoc @@ -43,7 +43,7 @@ spec: bootMode: "UEFI" <10> rootDeviceHints: wwn: "0x11111000000asd123" - cpuset: "0-3" <11> + cpuset: "0-1,52-53" <11> nodeNetwork: <12> interfaces: - name: eno1 diff --git a/snippets/ztp-performance-profile.adoc b/snippets/ztp-performance-profile.adoc index 17ba9fd79f..56f3d52c0b 100644 --- a/snippets/ztp-performance-profile.adoc +++ b/snippets/ztp-performance-profile.adoc @@ -11,8 +11,8 @@ spec: - rcupdate.rcu_normal_after_boot=0 - "efi=runtime" <2> cpu: - isolated: 4-103 <3> - reserved: 0-3 <4> + isolated: 2-51,54-103 <3> + reserved: 0-1,52-53 <4> hugepages: defaultHugepagesSize: 1G pages: @@ -30,6 +30,11 @@ spec: <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`. <2> Configures UEFI secure boot for the cluster host. <3> Set the isolated CPUs. Ensure all of the Hyper-Threading pairs match. ++ +[NOTE] +==== +The reserved and isolated CPU pools must not overlap and together must span all available cores. +==== <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. <5> Set the number of huge pages. <6> Set the huge page size.