sandbox_remove: Ensure that the pod infra container exit file is removed

mrunalp · mrunalp · commit 4477b9db7419 · 2019-09-24T15:23:55.000-07:00
Signed-off-by: Mrunal Patel &lt;mrunalp@gmail.com&gt;
diff --git a/server/sandbox_remove.go b/server/sandbox_remove.go
@@ -2,6 +2,8 @@ package server
 
 import (
 	"fmt"
+	"os"
+	"path/filepath"
 	"time"
 
 	"github.com/containers/storage"
@@ -99,6 +101,9 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
 	if err := s.CtrIDIndex().Delete(podInfraContainer.ID()); err != nil {
 		return nil, fmt.Errorf("failed to delete infra container %s in pod sandbox %s from index: %v", podInfraContainer.ID(), sb.ID(), err)
 	}
+	if err := os.Remove(filepath.Join(s.Config().RuntimeConfig.ContainerExitsDir, podInfraContainer.ID())); err != nil && !os.IsNotExist(err) {
+		return nil, errors.Wrapf(err, "failed to remove pod infra container exit file %s", podInfraContainer.ID())
+	}
 
 	s.ReleasePodName(sb.Name())
 	s.removeSandbox(sb.ID())
