Revert "runtime_vm: Cleanup process when the Container is Stopped"

fidencio · fidencio · commit dd507bd68bac · 2020-08-31T21:05:00.000+02:00
This reverts commit 67dcd05. We cannot simply delete the container when its status changes to stopped. The intention of this fix is okay-ish, but implemented in the wrong layer. What containerd does is calling Shutdown(), when the *pod* is finished, and that's what we should do as well. Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
diff --git a/internal/oci/runtime_vm.go b/internal/oci/runtime_vm.go
@@ -276,12 +276,6 @@ 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
`@@ -276,12 +276,6 @@ func (r runtimeVM) StartContainer(c Container) error {`
`276`	`276`	`if err1 := r.updateContainerStatus(c); err1 != nil {`
`277`	`277`	`logrus.Warningf("error updating container status %v", err1)`
`278`	`278`	`}`
`279`		`-`
`280`		`- if c.state.Status == ContainerStateStopped {`
`281`		`- if err1 := r.deleteContainer(c, true); err1 != nil {`
`282`		`- logrus.WithError(err1).Infof("deleteContainer failed for container %s", c.ID())`
`283`		`- }`
`284`		`- }`
`285`	`279`	`}`
`286`	`280`	`}()`
`287`	`281`