restore: Cleanup orphaned exit files leaked before

mrunalp · mrunalp · commit 683c63fe75f4 · 2019-09-24T15:23:55.000-07:00
This should clean up the exit files that we leaked
before.

Signed-off-by: Mrunal Patel &lt;mrunalp@gmail.com&gt;
diff --git a/server/server.go b/server/server.go
@@ -221,6 +221,37 @@ func (s *Server) restore() {
 		}
 		sb.AddIP(ip)
 	}
+
+	// Clean up orphaned exit files
+	var exitIDs []string
+
+	exitDir := s.Config().RuntimeConfig.ContainerExitsDir
+	err = filepath.Walk(exitDir, func(path string, info os.FileInfo, err error) error {
+		exitFileName := filepath.Base(path)
+		if path != exitDir {
+			exitIDs = append(exitIDs, exitFileName)
+		}
+		return nil
+	})
+	if err != nil {
+		logrus.Warnf("Failed to walk exit dir %v: %v", exitDir, err)
+	}
+	for _, exitID := range exitIDs {
+		logrus.Warnf("Checking exit file: %v", exitID)
+		ctr := s.GetContainer(exitID)
+		if ctr != nil {
+			continue
+		} else {
+			sb := s.GetSandbox(exitID)
+			if sb != nil {
+				continue
+			}
+		}
+		logrus.Warnf("Removing exit file: %v", exitID)
+		if err := os.Remove(filepath.Join(exitDir, exitID)); err != nil && !os.IsNotExist(err) {
+			logrus.Warnf("Failed to remove container exit file during restore cleanup %s: %v", exitID, err)
+		}
+	}
 }
 
 // cleanupSandboxesOnShutdown Remove all running Sandboxes on system shutdown
