runtime_vm: Cleanup process when the Container is Stopped

fidencio · fidencio · commit 67dcd05de1ea · 2020-08-10T10:18:50.000+02:00
When the container finishes its execution a containerd-shim-kata-v2 process is left behind (only when using CRI-O). The reason for that seems to be CRI-O not doing a cleanup of the process whenever the container state has changed its state from running to stopped. The most reasonable way found to perform such cleanup seems to be taking advantage of the goroutine used to update the container status and performing the cleanup there, whenever it's needed. Related: kata-containers/runtime#2719 Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> (cherry picked from commit 814c1bb) (cherry picked from commit adb657c)
diff --git a/internal/oci/runtime_vm.go b/internal/oci/runtime_vm.go
@@ -261,6 +261,12 @@ func (r *runtimeVM) StartContainer(c *Container) error {
 			if err1 := r.updateContainerStatus(c); err1 != nil {
 				logrus.Warningf("error updating container status %v", err1)
 			}
+
+			if c.state.Status == ContainerStateStopped {
+				if err1 := r.deleteContainer(c, true); err1 != nil {
+					logrus.WithError(err1).Infof("deleteContainer failed for container %s", c.ID())
+				}
+			}
 		}
 	}()
 

Original file line number	Diff line number	Diff line change
`@@ -261,6 +261,12 @@ func (r runtimeVM) StartContainer(c Container) error {`
`261`	`261`	`if err1 := r.updateContainerStatus(c); err1 != nil {`
`262`	`262`	`logrus.Warningf("error updating container status %v", err1)`
`263`	`263`	`}`
	`264`	`+`
	`265`	`+ if c.state.Status == ContainerStateStopped {`
	`266`	`+ if err1 := r.deleteContainer(c, true); err1 != nil {`
	`267`	`+ logrus.WithError(err1).Infof("deleteContainer failed for container %s", c.ID())`
	`268`	`+ }`
	`269`	`+ }`
`264`	`270`	`}`
`265`	`271`	`}()`
`266`	`272`