Merge pull request #4065 from mheon/unconditional_conmon_rm

Unconditionally remove conmon files before starting

1 files changed, 8 insertions, 8 deletions

diff --git a/libpod/container_internal.go b/libpod/container_internal.go
index 7403a216b..f1456548b 100644
--- a/libpod/container_internal.go
+++ b/libpod/container_internal.go
@@ -646,14 +646,8 @@ func (c *Container) removeConmonFiles() error {
 
 	// Remove the exit file so we don't leak memory in tmpfs
 	exitFile := filepath.Join(c.ociRuntime.exitsDir, c.ID())
-	if _, err := os.Stat(exitFile); err != nil {
-		if !os.IsNotExist(err) {
-			return errors.Wrapf(err, "error running stat on container %s exit file", c.ID())
-		}
-	} else {
-		if err := os.Remove(exitFile); err != nil {
-			return errors.Wrapf(err, "error removing container %s exit file", c.ID())
-		}
+	if err := os.Remove(exitFile); err != nil && !os.IsNotExist(err) {
+		return errors.Wrapf(err, "error removing container %s exit file", c.ID())
 	}
 
 	return nil
@@ -922,6 +916,12 @@ func (c *Container) init(ctx context.Context, retainRetries bool) error {
 	span.SetTag("struct", "container")
 	defer span.Finish()
 
+	// Unconditionally remove conmon temporary files.
+	// We've been running into far too many issues where they block startup.
+	if err := c.removeConmonFiles(); err != nil {
+		return err
+	}
+
 	// Generate the OCI newSpec
 	newSpec, err := c.generateSpec(ctx)
 	if err != nil {