Skip to content

[release-1.29] Fix container stats label filter #8575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2024
Merged

[release-1.29] Fix container stats label filter #8575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions server/container_stats_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,21 @@ func (s *Server) ListContainerStats(ctx context.Context, req *types.ListContaine
if err != nil {
return nil, err
}
filter := req.Filter
if filter != nil {
if req.Filter != nil {
cFilter := &types.ContainerFilter{
Id: req.Filter.Id,
PodSandboxId: req.Filter.PodSandboxId,
LabelSelector: req.Filter.LabelSelector,
}
ctrList = s.filterContainerList(ctx, cFilter, ctrList)

filteredCtrList := []*oci.Container{}
for _, ctr := range ctrList {
if filterContainer(ctr.CRIContainer(), cFilter) {
filteredCtrList = append(filteredCtrList, ctr)
}
}
ctrList = filteredCtrList
}

return &types.ListContainerStatsResponse{
Expand Down
4 changes: 4 additions & 0 deletions test/stats.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ function teardown() {
# Assuming the two containers can't have exactly same memory usage
echo "checking $ctr1_mem != $ctr2_mem"
[ "$ctr1_mem" != "$ctr2_mem" ]

# Test if the label filtering works
[ "$(crictl stats | wc -l)" == 3 ]
[ "$(crictl stats --label tier=backend | wc -l)" == 2 ]
}

@test "pod stats" {
Expand Down