vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #249 from mrunalp/dev_shm

Browse source 
Add support for pod /dev/shm that is shared by the pod ctrs
This commit is contained in:
Antonio Murdaca 2016-12-09 09:46:27 +01:00 • committed by GitHub
commit d9edbe6817
6 changed files with 53 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/sandbox_remove.go
View file

@ -4,6 +4,7 @@ import (
"fmt"
"os"
"path/filepath"
"syscall"
"github.com/Sirupsen/logrus"
"github.com/kubernetes-incubator/cri-o/oci"
@ -65,6 +66,13 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
return nil, err
}
// unmount the shm for the pod
if sb.shmPath != "/dev/shm" {
if err := syscall.Unmount(sb.shmPath, syscall.MNT_DETACH); err != nil {
return nil, err
}
}
// Remove the files related to the sandbox
podSandboxDir := filepath.Join(s.config.SandboxDir, sb.id)
if err := os.RemoveAll(podSandboxDir); err != nil {