cri: Fix umarshal metrics#8473
Merged
samuelkarp merged 1 commit intocontainerd:mainfrom May 4, 2023
Merged
Conversation
Signed-off-by: Brad Davidson <[email protected]>
|
Hi @brandond. Thanks for your PR. I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions 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. |
Member
|
/ok-to-test |
dcantah
approved these changes
May 4, 2023
dmcgowan
approved these changes
May 4, 2023
Iceber
approved these changes
May 4, 2023
samuelkarp
approved these changes
May 4, 2023
fuweid
added
the
cherry-picked/1.7.x
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is essentially the same change as #8302, but for the CRI server.
Without this fix, the kubelet fails to collects stats with:
time="2023-05-03T00:47:28.890947681Z" level=error msg="ListContainerStats failed" error="failed to convert to cri containerd stats format: failed to decode container metrics for \"6fb75f811841004943a338064d05f643b797afac8c09786551a0d5c0865c20b7\": failed to obtain cpu stats: unexpected metrics type: &Metrics{Pids:&PidsStat{Current:13,Limit:18446744073709551615,XXX_unrecognized:[],},CPU:&CPUStat{UsageUsec:1224890,UserUsec:1179817,SystemUsec:45073,NrPeriods:0,NrThrottled:0,ThrottledUsec:0,XXX_unrecognized:[],},Memory:&MemoryStat{Anon:12480512,File:8192,KernelStack:212992,Slab:260032,Sock:12288,Shmem:0,FileMapped:0,FileDirty:8192,FileWriteback:0,AnonThp:0,InactiveAnon:12476416,ActiveAnon:4096,InactiveFile:0,ActiveFile:8192,Unevictable:0,SlabReclaimable:92992,SlabUnreclaimable:167040,Pgfault:5710,Pgmajfault:0,WorkingsetRefault:0,WorkingsetActivate:0,WorkingsetNodereclaim:0,Pgrefill:0,Pgscan:0,Pgsteal:0,Pgactivate:2,Pgdeactivate:0,Pglazyfree:1,Pglazyfreed:0,ThpFaultAlloc:0,ThpCollapseAlloc:0,Usage:13189120,UsageLimit:18446744073709551615,SwapUsage:0,SwapLimit:18446744073709551615,XXX_unrecognized:[],},Rdma:&RdmaStat{Current:[]*RdmaEntry{},Limit:[]*RdmaEntry{},XXX_unrecognized:[],},Io:&IOStat{Usage:[]*IOEntry{},XXX_unrecognized:[],},Hugetlb:[]*HugeTlbStat{&HugeTlbStat{Current:0,Max:18446744073709551615,Pagesize:2MB,XXX_unrecognized:[],},&HugeTlbStat{Current:0,Max:18446744073709551615,Pagesize:1GB,XXX_unrecognized:[],},},MemoryEvents:&MemoryEvents{Low:0,High:0,Max:0,Oom:0,OomKill:0,XXX_unrecognized:[],},XXX_unrecognized:[],}"