cri: close fifos when container is deleted

henry118 · fuweid · commit be4909e950da · 2022-04-27T00:13:46.000+08:00
Signed-off-by: Henry Wang <henwang@amazon.com> (cherry picked from commit 8710d4d) Signed-off-by: Wei Fu <fuweid89@gmail.com>
diff --git a/pkg/cri/store/container/container.go b/pkg/cri/store/container/container.go
@@ -200,7 +200,11 @@ func (s *Store) Delete(id string) {
 		// So we need to return if there are error.
 		return
 	}
-	s.labels.Release(s.containers[id].ProcessLabel)
+	c := s.containers[id]
+	if c.IO != nil {
+		c.IO.Close()
+	}
+	s.labels.Release(c.ProcessLabel)
 	s.idIndex.Delete(id) // nolint: errcheck
 	delete(s.containers, id)
 }

Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,11 @@ func (s *Store) Delete(id string) {`
`200`	`200`	`// So we need to return if there are error.`
`201`	`201`	`return`
`202`	`202`	`}`
`203`		`- s.labels.Release(s.containers[id].ProcessLabel)`
	`203`	`+ c := s.containers[id]`
	`204`	`+ if c.IO != nil {`
	`205`	`+ c.IO.Close()`
	`206`	`+ }`
	`207`	`+ s.labels.Release(c.ProcessLabel)`
`204`	`208`	`s.idIndex.Delete(id) // nolint: errcheck`
`205`	`209`	`delete(s.containers, id)`
`206`	`210`	`}`