[release/1.6] Stats() shouldn't assume s.container is non-nil

Kazuyoshi Kato · Kazuyoshi Kato · commit 8a9d69385024 · 2022-10-18T14:57:54.000Z
Like other exported methods, Stats() shouldn't assume s.container is non-nil. Fixes #7468. Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com> (cherry picked from commit 49a54e2) Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go
@@ -597,7 +597,11 @@ func (s *service) Shutdown(ctx context.Context, r *taskAPI.ShutdownRequest) (*pt
 }
 
 func (s *service) Stats(ctx context.Context, r *taskAPI.StatsRequest) (*taskAPI.StatsResponse, error) {
-	cgx := s.container.Cgroup()
+	container, err := s.getContainer()
+	if err != nil {
+		return nil, err
+	}
+	cgx := container.Cgroup()
 	if cgx == nil {
 		return nil, errdefs.ToGRPCf(errdefs.ErrNotFound, "cgroup does not exist")
 	}

Original file line number	Diff line number	Diff line change
`@@ -597,7 +597,11 @@ func (s service) Shutdown(ctx context.Context, r taskAPI.ShutdownRequest) (*pt`
`597`	`597`	`}`
`598`	`598`
`599`	`599`	`func (s service) Stats(ctx context.Context, r taskAPI.StatsRequest) (*taskAPI.StatsResponse, error) {`
`600`		`- cgx := s.container.Cgroup()`
	`600`	`+ container, err := s.getContainer()`
	`601`	`+ if err != nil {`
	`602`	`+ return nil, err`
	`603`	`+ }`
	`604`	`+ cgx := container.Cgroup()`
`601`	`605`	`if cgx == nil {`
`602`	`606`	`return nil, errdefs.ToGRPCf(errdefs.ErrNotFound, "cgroup does not exist")`
`603`	`607`	`}`