github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-17 07:27:22 +00:00
Code Issues Projects Releases Wiki Activity

volumes: Handle k8s empty-dirs of "default" medium type

Browse Source 
We were considering all empty-dir k8s volumes as backed by tmpfs.
However they can be backed by a host directory as well.
Pass those as 9p volumes, while tmpfs volumes are handled as before,
namely creating a tmpfs directory inside the guest.
The only way to detect "Memory" empty-dirs is to actually check if the
volume is mounted as a tmpfs mount, since any information of k8s
"medium" is lost at the OCI layer.

Fixes #1341

Signed-off-by: Archana Shinde <archana.m.shinde@intel.com>
This commit is contained in:
Archana Shinde 2019-03-14 18:05:09 -07:00
parent 8058fb0791
commit 47a6023382
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/katautils/utils.go
View File

@ -14,6 +14,8 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
"syscall" "syscall"
vc "github.com/kata-containers/runtime/virtcontainers"
) )
const ( const (
@ -43,7 +45,9 @@ func IsEphemeralStorage(path string) bool {
if len(splitSourceSlice) > 1 { if len(splitSourceSlice) > 1 {
storageType := splitSourceSlice[len(splitSourceSlice)-2] storageType := splitSourceSlice[len(splitSourceSlice)-2]
if storageType == k8sEmptyDir { if storageType == k8sEmptyDir {
return true if _, fsType, _ := vc.GetDevicePathAndFsType(path); fsType == "tmpfs" {
return true
}
} }
} }
return false return false

2
virtcontainers/container.go
View File

@ -1138,7 +1138,7 @@ func (c *Container) hotplugDrive() error {
} }
// If device mapper device, then fetch the full path of the device // If device mapper device, then fetch the full path of the device
devicePath, fsType, err := getDevicePathAndFsType(dev.mountPoint) devicePath, fsType, err := GetDevicePathAndFsType(dev.mountPoint)
if err != nil { if err != nil {
return err return err
} }

4
virtcontainers/mount.go
View File

@ -164,7 +164,9 @@ const (
procTypeIndex procTypeIndex
) )
func getDevicePathAndFsType(mountPoint string) (devicePath, fsType string, err error) { // GetDevicePathAndFsType gets the device for the mount point and the file system type
// of the mount.
func GetDevicePathAndFsType(mountPoint string) (devicePath, fsType string, err error) {
if mountPoint == "" { if mountPoint == "" {
err = fmt.Errorf("Mount point cannot be empty") err = fmt.Errorf("Mount point cannot be empty")
return return

4
virtcontainers/mount_test.go
View File

@ -238,7 +238,7 @@ func TestGetDeviceForPathBindMount(t *testing.T) {
} }
func TestGetDevicePathAndFsTypeEmptyMount(t *testing.T) { func TestGetDevicePathAndFsTypeEmptyMount(t *testing.T) {
_, _, err := getDevicePathAndFsType("") _, _, err := GetDevicePathAndFsType("")
if err == nil { if err == nil {
t.Fatal() t.Fatal()
@ -246,7 +246,7 @@ func TestGetDevicePathAndFsTypeEmptyMount(t *testing.T) {
} }
func TestGetDevicePathAndFsTypeSuccessful(t *testing.T) { func TestGetDevicePathAndFsTypeSuccessful(t *testing.T) {
path, fstype, err := getDevicePathAndFsType("/proc") path, fstype, err := GetDevicePathAndFsType("/proc")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)