github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 06:54:01 +00:00
Code Issues Projects Releases Wiki Activity

Added test case for subpath mount with file

Browse Source
This commit is contained in:
Janario Oliveira 2019-11-04 19:43:55 +01:00
parent 2ca213579d
commit cb0ab22b2e
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/volume/util/subpath/subpath_linux.go
View File

@ -241,8 +241,13 @@ func doCleanSubPaths(mounter mount.Interface, podDir string, volumeName string)
if err = doCleanSubPath(mounter, fullContainerDirPath, filepath.Base(path)); err != nil { if err = doCleanSubPath(mounter, fullContainerDirPath, filepath.Base(path)); err != nil {
return err return err
} }
// skip subdirs of the volume: it only matters the first level to unmount, otherwise it would try to unmount subdir of the volume
return filepath.SkipDir if info.IsDir() {
// skip subdirs of the volume: it only matters the first level to unmount, otherwise it would try to unmount subdir of the volume
return filepath.SkipDir
}
return nil
}) })
if err != nil { if err != nil {
return fmt.Errorf("error processing %s: %s", fullContainerDirPath, err) return fmt.Errorf("error processing %s: %s", fullContainerDirPath, err)

31
pkg/volume/util/subpath/subpath_linux_test.go
View File

@ -543,17 +543,36 @@ func TestCleanSubPaths(t *testing.T) {
{ {
name: "subpath-with-files", name: "subpath-with-files",
prepare: func(base string) ([]mount.MountPoint, error) { prepare: func(base string) ([]mount.MountPoint, error) {
path := filepath.Join(base, containerSubPathDirectoryName, testVol, "container1", "0") containerPath := filepath.Join(base, containerSubPathDirectoryName, testVol, "container1")
path2 := filepath.Join(base, containerSubPathDirectoryName, testVol, "container1", "1") if err := os.MkdirAll(containerPath, defaultPerm); err != nil {
if err := os.MkdirAll(filepath.Join(path, "my-dir-1"), defaultPerm); err != nil {
return nil, err return nil, err
} }
if err := os.MkdirAll(filepath.Join(path2, "my-dir-2"), defaultPerm); err != nil {
file0 := filepath.Join(containerPath, "0")
if err := ioutil.WriteFile(file0, []byte{}, defaultPerm); err != nil {
return nil, err return nil, err
} }
dir1 := filepath.Join(containerPath, "1")
if err := os.MkdirAll(filepath.Join(dir1, "my-dir-1"), defaultPerm); err != nil {
return nil, err
}
dir2 := filepath.Join(containerPath, "2")
if err := os.MkdirAll(filepath.Join(dir2, "my-dir-2"), defaultPerm); err != nil {
return nil, err
}
file3 := filepath.Join(containerPath, "3")
if err := ioutil.WriteFile(file3, []byte{}, defaultPerm); err != nil {
return nil, err
}
mounts := []mount.MountPoint{ mounts := []mount.MountPoint{
{Device: "/dev/sdb", Path: path}, {Device: "/dev/sdb", Path: file0},
{Device: "/dev/sdc", Path: path2}, {Device: "/dev/sdc", Path: dir1},
{Device: "/dev/sdd", Path: dir2},
{Device: "/dev/sde", Path: file3},
} }
return mounts, nil return mounts, nil
}, },