From 51a8db233d5db8142705424d4b0ccf2db13c4140 Mon Sep 17 00:00:00 2001 From: ruiwen-zhao Date: Fri, 3 Feb 2023 20:09:50 +0000 Subject: [PATCH] Send container events with nil PodSandboxStatus Signed-off-by: ruiwen-zhao --- pkg/cri/sbserver/helpers.go | 6 ++---- pkg/cri/server/helpers.go | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkg/cri/sbserver/helpers.go b/pkg/cri/sbserver/helpers.go index eb7afb660..9c0367dc6 100644 --- a/pkg/cri/sbserver/helpers.go +++ b/pkg/cri/sbserver/helpers.go @@ -525,10 +525,8 @@ func copyResourcesToStatus(spec *runtimespec.Spec, status containerstore.Status) func (c *criService) generateAndSendContainerEvent(ctx context.Context, containerID string, sandboxID string, eventType runtime.ContainerEventType) { podSandboxStatus, err := c.getPodSandboxStatus(ctx, sandboxID) if err != nil { - // TODO(https://github.com/containerd/containerd/issues/7785): - // Do not skip events with nil PodSandboxStatus. - logrus.Errorf("Failed to get podSandbox status for container event for sandboxID %q: %v. Skipping sending the event.", sandboxID, err) - return + logrus.Warnf("Failed to get podSandbox status for container event for sandboxID %q: %v. Sending the event with nil podSandboxStatus.", sandboxID, err) + podSandboxStatus = nil } containerStatuses, err := c.getContainerStatuses(ctx, sandboxID) if err != nil { diff --git a/pkg/cri/server/helpers.go b/pkg/cri/server/helpers.go index 9844b5564..7a9e6b647 100644 --- a/pkg/cri/server/helpers.go +++ b/pkg/cri/server/helpers.go @@ -523,10 +523,8 @@ func copyResourcesToStatus(spec *runtimespec.Spec, status containerstore.Status) func (c *criService) generateAndSendContainerEvent(ctx context.Context, containerID string, sandboxID string, eventType runtime.ContainerEventType) { podSandboxStatus, err := c.getPodSandboxStatus(ctx, sandboxID) if err != nil { - // TODO(https://github.com/containerd/containerd/issues/7785): - // Do not skip events with nil PodSandboxStatus. - logrus.Errorf("Failed to get podSandbox status for container event for sandboxID %q: %v. Skipping sending the event.", sandboxID, err) - return + logrus.Warnf("Failed to get podSandbox status for container event for sandboxID %q: %v. Sending the event with nil podSandboxStatus.", sandboxID, err) + podSandboxStatus = nil } containerStatuses, err := c.getContainerStatuses(ctx, sandboxID) if err != nil {