From 821c961c86f370d06bdb6ae3f8bb797821a390c0 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Thu, 3 Feb 2022 13:18:43 +0100 Subject: [PATCH] pkg/oom/v2: handle EventChan routine shutdown quietly When the cgroup is removed, EventChan is closed (this was pulled in by 8d69c041c52ac688430df7fd540018bf74f341c2). This results in a nil error being received. Don't log an error in that case but instead return. Signed-off-by: Jeremi Piotrowski --- pkg/oom/v2/v2.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkg/oom/v2/v2.go b/pkg/oom/v2/v2.go index 198dc3b1f..49ad3092d 100644 --- a/pkg/oom/v2/v2.go +++ b/pkg/oom/v2/v2.go @@ -102,10 +102,13 @@ func (w *watcher) Add(id string, cgx interface{}) error { i.ev = ev w.itemCh <- i case err := <-errCh: - i.err = err - w.itemCh <- i - // we no longer get any event/err when we got an err - logrus.WithError(err).Warn("error from *cgroupsv2.Manager.EventChan") + // channel is closed when cgroup gets deleted + if err != nil { + i.err = err + w.itemCh <- i + // we no longer get any event/err when we got an err + logrus.WithError(err).Warn("error from *cgroupsv2.Manager.EventChan") + } return } }