Merge pull request #6735 from AkihiroSuda/cherrypick-6323-1.5

[release/1.5 backport] cgroup2: monitor OOMKill instead of OOM to prevent missing container events
containerd · Mar 24, 2022 · a553ec5 · a553ec5
2 parents 3df54a8 + 1c68f50
commit a553ec5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/oom/v2/v2.go b/pkg/oom/v2/v2.go
@@ -71,15 +71,15 @@ func (w *watcher) Run(ctx context.Context) {
 				continue
 			}
 			lastOOM := lastOOMMap[i.id]
-			if i.ev.OOM > lastOOM {
+			if i.ev.OOMKill > lastOOM {
 				if err := w.publisher.Publish(ctx, runtime.TaskOOMEventTopic, &eventstypes.TaskOOM{
 					ContainerID: i.id,
 				}); err != nil {
 					logrus.WithError(err).Error("publish OOM event")
 				}
 			}
-			if i.ev.OOM > 0 {
-				lastOOMMap[i.id] = i.ev.OOM
+			if i.ev.OOMKill > 0 {
+				lastOOMMap[i.id] = i.ev.OOMKill
 			}
 		}
 	}