Skip to content

Commit 1fb86a7

Browse files
committed
Fix TestMultipleVMs_Isolated
Signed-off-by: Kazuyoshi Kato <[email protected]>
1 parent db93762 commit 1fb86a7

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

runtime/service.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,9 @@ func (s *service) Start(requestCtx context.Context, req *taskAPI.StartRequest) (
778778

779779
func (s *service) Delete(requestCtx context.Context, req *taskAPI.DeleteRequest) (*taskAPI.DeleteResponse, error) {
780780
defer logPanicAndDie(log.G(requestCtx))
781-
log.G(requestCtx).WithFields(logrus.Fields{"id": req.ID, "exec_id": req.ExecID}).Debug("delete")
781+
logger := log.G(requestCtx).WithFields(logrus.Fields{"id": req.ID, "exec_id": req.ExecID})
782+
783+
logger.Debug("delete")
782784

783785
resp, err := s.taskManager.DeleteProcess(requestCtx, req, s.agentClient)
784786
if err != nil {
@@ -790,7 +792,11 @@ func (s *service) Delete(requestCtx context.Context, req *taskAPI.DeleteRequest)
790792
return nil, errors.Wrapf(err, "failed to find the bundle directory of the container: %s", req.ID)
791793
}
792794

793-
if err = os.Remove(dir.RootPath()); err != nil {
795+
_, err = os.Stat(dir.RootPath())
796+
if os.IsNotExist(err) {
797+
// is this really bad?
798+
logger.Warnf("failed to delete %s: %v", dir.RootPath(), err)
799+
} else if err = os.Remove(dir.RootPath()); err != nil {
794800
return nil, errors.Wrapf(err, "failed to remove the bundle directory of the container: %s", req.ID)
795801
}
796802

0 commit comments

Comments
 (0)