Skip to content

Commit 4eee0c8

Browse files
authored
Merge pull request #70534 from mburke5678/node-cgroup-characteristic-note-follow-up
Removed snippet from ifdef
2 parents 12afe2f + 701121b commit 4eee0c8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

modules/nodes-clusters-cgroups-2.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ endif::post[]
2626
endif::openshift-origin[]
2727

2828
ifdef::post[]
29-
include::snippets/cgroupv2-vs-cgroupv1.adoc[]
29+
cgroup v2 is the current version of the Linux cgroup API. cgroup v2 offers several improvements over cgroup v1, including a unified hierarchy, safer sub-tree delegation, new features such as link:https://www.kernel.org/doc/html/latest/accounting/psi.html[Pressure Stall Information], and enhanced resource management and isolation. However, cgroup v2 has different CPU, memory, and I/O management characteristics than cgroup v1. Therefore, some workloads might experience slight differences in memory or CPU usage on clusters that run cgroup v2.
3030

3131
You can change between cgroup v1 and cgroup v2, as needed. Enabling cgroup v1 in {product-title} disables all cgroup v2 controllers and hierarchies in your cluster.
3232
endif::post[]

snippets/cgroupv2-vs-cgroupv1.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Text snippet included in the following modules:
22
//
33
// * installing/install-config/enabling-cgroup-v1.adoc
4-
// * modules/nodes-clusters-cgroups-2.adoc
54
// * nodes/clusters/nodes-cluster-cgroups-2.adoc
65

76
:_mod-docs-content-type: SNIPPET
87

8+
// * Text included in modules/nodes-cluster-cgroups-2.adoc as text, not a snippet because snippets cannt be in an ifdef. Also update there if you edit this text.
99
cgroup v2 is the current version of the Linux cgroup API. cgroup v2 offers several improvements over cgroup v1, including a unified hierarchy, safer sub-tree delegation, new features such as link:https://www.kernel.org/doc/html/latest/accounting/psi.html[Pressure Stall Information], and enhanced resource management and isolation. However, cgroup v2 has different CPU, memory, and I/O management characteristics than cgroup v1. Therefore, some workloads might experience slight differences in memory or CPU usage on clusters that run cgroup v2.
1010

0 commit comments

Comments
 (0)