github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8047 from ruiwen-zhao/send_nil

Browse Source 
Send container events with nil PodSandboxStatus
This commit is contained in:
Derek McGowan
2023-02-13 11:38:14 -08:00
committed by GitHub
parent 164ac924f8 51a8db233d
commit edb8ebaf07
7 changed files with 18 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cri/server/helpers.go
View File

@@ -530,10 +530,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 {