Skip to content

Support to handle more than 4 fields in cpuacct.stat#231

Merged
kzys merged 2 commits intocontainerd:mainfrom
jellor:main
Sep 16, 2022
Merged

Support to handle more than 4 fields in cpuacct.stat#231
kzys merged 2 commits intocontainerd:mainfrom
jellor:main

Conversation

@jellor
Copy link
Contributor

@jellor jellor commented May 16, 2022

In some kernel, the cpuacct.stat has more than 4 fields.

# cat /sys/fs/cgroup/cpuacct/kubepods/besteffort/pod7a0c0cd5-4414-4a20-9105-993e7cbaf371/5a73789dcb4fd96e5d4946dd9ea7ed444c3c896eb51f6a98c8cff11e0b1ec48c/cpuacct.stat
user 32
system 89
sched_delay 0

should handle this case.

Signed-off-by: Guodong Zhu [email protected]

Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@jellor jellor requested a review from estesp July 21, 2022 16:10
@jellor
Copy link
Contributor Author

jellor commented Jul 28, 2022

@AkihiroSuda PTAL

@kzys kzys merged commit e8a4323 into containerd:main Sep 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants