Thanks to visit codestin.com
Credit goes to github.com

Skip to content

stats: skipped stopped containers on container list stats #3482

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
openshift-merge-robot merged 2 commits into from
Aug 4, 2020
Merged

stats: skipped stopped containers on container list stats #3482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
857bcd3
stats: skipped stopped containers on container list stats
haircommander Mar 26, 2020
4d21cd3
add stats list unit tests
haircommander Jul 27, 2020
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
7 changes: 6 additions & 1 deletion server/container_stats_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@ package server

import (
"github.com/cri-o/cri-o/internal/log"
"github.com/cri-o/cri-o/internal/oci"
"golang.org/x/net/context"
pb "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
)

// ListContainerStats returns stats of all running containers.
func (s *Server) ListContainerStats(ctx context.Context, req *pb.ListContainerStatsRequest) (*pb.ListContainerStatsResponse, error) {
ctrList, err := s.ContainerServer.ListContainers()
ctrList, err := s.ContainerServer.ListContainers(
func(container *oci.Container) bool {
return container.StateNoLock().Status != oci.ContainerStateStopped
},
)
if err != nil {
return nil, err
}
Expand Down
61 changes: 61 additions & 0 deletions server/container_stats_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package server_test
import (
"context"

"github.com/cri-o/cri-o/internal/oci"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
pb "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
Expand Down Expand Up @@ -31,3 +32,63 @@ var _ = t.Describe("ContainerStats", func() {
})
})
})

var _ = t.Describe("ContainerStatsList", func() {
// Prepare the sut
BeforeEach(func() {
beforeEach()
setupSUT()
})

AfterEach(afterEach)

t.Describe("ContainerStatsList", func() {
It("should succeed", func() {
// Given
addContainerAndSandbox()
// When
response, err := sut.ListContainerStats(context.Background(),
&pb.ListContainerStatsRequest{})

// Then
Expect(err).To(BeNil())
Expect(response).NotTo(BeNil())
Expect(len(response.Stats)).To(Equal(1))
})
It("should filter stopped container", func() {
// Given
state := oci.ContainerState{}
state.Status = oci.ContainerStateStopped
testContainer.SetState(&state)
addContainerAndSandbox()

// When
response, err := sut.ListContainerStats(context.Background(),
&pb.ListContainerStatsRequest{},
)

// Then
Expect(err).To(BeNil())
Expect(response).NotTo(BeNil())
Expect(len(response.Stats)).To(Equal(0))
})
It("should filter by id", func() {
// Given
addContainerAndSandbox()

// When
response, err := sut.ListContainerStats(context.Background(),
&pb.ListContainerStatsRequest{
Filter: &pb.ContainerStatsFilter{
Id: "invalid",
},
},
)

// Then
Expect(err).To(BeNil())
Expect(response).NotTo(BeNil())
Expect(len(response.Stats)).To(Equal(0))
})
})
})