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

Merge pull request #6504 from jepio/jepio/pkg-oom-v2-quiet-shutdown

Browse Source 
pkg/oom/v2: handle EventChan routine shutdown quietly
This commit is contained in:
Derek McGowan 2022-02-07 16:20:42 -08:00 committed by GitHub
commit 33b7f779a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/oom/v2/v2.go
View File

@ -102,10 +102,13 @@ func (w *watcher) Add(id string, cgx interface{}) error {
i.ev = ev i.ev = ev
w.itemCh <- i w.itemCh <- i
case err := <-errCh: case err := <-errCh:
i.err = err // channel is closed when cgroup gets deleted
w.itemCh <- i if err != nil {
// we no longer get any event/err when we got an err i.err = err
logrus.WithError(err).Warn("error from *cgroupsv2.Manager.EventChan") 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 return
} }
} }