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

Merge pull request #177 from miaoyq/related-to-173

Browse Source 
Exclude the event of sandbox containers from event stream
This commit is contained in:
Lantao Liu 2017-08-28 10:00:21 -07:00 committed by GitHub
commit 3b2d29be46
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/server/events.go
View File

@ -97,6 +97,9 @@ func (c *criContainerdService) handleEvent(evt *events.Envelope) {
glog.V(2).Infof("TaskExit event %+v", e) glog.V(2).Infof("TaskExit event %+v", e)
cntr, err := c.containerStore.Get(e.ContainerID) cntr, err := c.containerStore.Get(e.ContainerID)
if err != nil { if err != nil {
if _, err := c.sandboxStore.Get(e.ContainerID); err == nil {
return
}
glog.Errorf("Failed to get container %q: %v", e.ContainerID, err) glog.Errorf("Failed to get container %q: %v", e.ContainerID, err)
return return
} }
@ -142,6 +145,9 @@ func (c *criContainerdService) handleEvent(evt *events.Envelope) {
glog.V(2).Infof("TaskOOM event %+v", e) glog.V(2).Infof("TaskOOM event %+v", e)
cntr, err := c.containerStore.Get(e.ContainerID) cntr, err := c.containerStore.Get(e.ContainerID)
if err != nil { if err != nil {
if _, err := c.sandboxStore.Get(e.ContainerID); err == nil {
return
}
glog.Errorf("Failed to get container %q: %v", e.ContainerID, err) glog.Errorf("Failed to get container %q: %v", e.ContainerID, err)
} }
err = cntr.Status.Update(func(status containerstore.Status) (containerstore.Status, error) { err = cntr.Status.Update(func(status containerstore.Status) (containerstore.Status, error) {