From b18542c5867bae801e6a05b6ea899e66dc730f07 Mon Sep 17 00:00:00 2001 From: Yanqiang Miao Date: Mon, 28 Aug 2017 14:21:03 +0800 Subject: [PATCH] Excloude the event of sandbox containers from event stream We should exclude the event of sandbox containers from event stream in order to avoid outputting unexpected error print. related #173 Signed-off-by: Yanqiang Miao --- pkg/server/events.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/server/events.go b/pkg/server/events.go index 02adcb1d4..3f0922815 100644 --- a/pkg/server/events.go +++ b/pkg/server/events.go @@ -97,6 +97,9 @@ func (c *criContainerdService) handleEvent(evt *events.Envelope) { glog.V(2).Infof("TaskExit event %+v", e) cntr, err := c.containerStore.Get(e.ContainerID) if err != nil { + if _, err := c.sandboxStore.Get(e.ContainerID); err == nil { + return + } glog.Errorf("Failed to get container %q: %v", e.ContainerID, err) return } @@ -142,6 +145,9 @@ func (c *criContainerdService) handleEvent(evt *events.Envelope) { glog.V(2).Infof("TaskOOM event %+v", e) cntr, err := c.containerStore.Get(e.ContainerID) if err != nil { + if _, err := c.sandboxStore.Get(e.ContainerID); err == nil { + return + } glog.Errorf("Failed to get container %q: %v", e.ContainerID, err) } err = cntr.Status.Update(func(status containerstore.Status) (containerstore.Status, error) {