Skip to content

cmd/runtimetest/main.go: Unify validateMountsExist and validateMountsOrder #456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhouhao3 merged 1 commit into from
Sep 1, 2017
Merged

cmd/runtimetest/main.go: Unify validateMountsExist and validateMountsOrder #456

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 54 additions & 80 deletions cmd/runtimetest/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,113 +576,91 @@ func validateGIDMappings(spec *rspec.Spec) error {
return validateIDMappings(spec.Linux.GIDMappings, "/proc/self/gid_map", "linux.gidMappings")
}

func mountMatch(configMount rspec.Mount, sysMount rspec.Mount) error {
if filepath.Clean(configMount.Destination) != sysMount.Destination {
return fmt.Errorf("mount destination expected: %v, actual: %v", configMount.Destination, sysMount.Destination)
func mountMatch(configMount rspec.Mount, sysMount *mount.Info) error {
sys := rspec.Mount{
Destination: sysMount.Mountpoint,
Type: sysMount.Fstype,
Source: sysMount.Source,
}

if configMount.Type != sysMount.Type {
return fmt.Errorf("mount %v type expected: %v, actual: %v", configMount.Destination, configMount.Type, sysMount.Type)
if filepath.Clean(configMount.Destination) != sys.Destination {
return fmt.Errorf("mount destination expected: %v, actual: %v", configMount.Destination, sys.Destination)
}

if filepath.Clean(configMount.Source) != sysMount.Source {
return fmt.Errorf("mount %v source expected: %v, actual: %v", configMount.Destination, configMount.Source, sysMount.Source)
if configMount.Type != sys.Type {
return fmt.Errorf("mount %v type expected: %v, actual: %v", configMount.Destination, configMount.Type, sys.Type)
}

if filepath.Clean(configMount.Source) != sys.Source {
return fmt.Errorf("mount %v source expected: %v, actual: %v", configMount.Destination, configMount.Source, sys.Source)
}

return nil
}

func validateMountsExist(spec *rspec.Spec) error {
func validateMounts(spec *rspec.Spec) error {
if runtime.GOOS == "windows" {
logrus.Warnf("mounts validation not yet implemented for OS %q", runtime.GOOS)
return nil
}

mountInfos, err := mount.GetMounts()
if err != nil {
return err
}

mountsMap := make(map[string][]rspec.Mount)
for _, mountInfo := range mountInfos {
m := rspec.Mount{
Destination: mountInfo.Mountpoint,
Type: mountInfo.Fstype,
Source: mountInfo.Source,
}
mountsMap[mountInfo.Mountpoint] = append(mountsMap[mountInfo.Mountpoint], m)
}

for _, configMount := range spec.Mounts {
var mountErrs error
var consumedSys = make(map[int]bool)
highestMatchedConfig := -1
highestMatchedSystem := -1
var j = 0
for i, configMount := range spec.Mounts {
if configMount.Type == "bind" || configMount.Type == "rbind" {
// TODO: add bind or rbind check.
continue
}

found := false
for _, sysMount := range mountsMap[filepath.Clean(configMount.Destination)] {
for k, sysMount := range mountInfos[j:] {
if err := mountMatch(configMount, sysMount); err == nil {
found = true
j += k + 1
consumedSys[j-1] = true
if j > highestMatchedSystem {
highestMatchedSystem = j - 1
highestMatchedConfig = i
}
break
}
}
if !found {
return fmt.Errorf("Expected mount %v does not exist", configMount)
}
}

return nil
}

func validateMountsOrder(spec *rspec.Spec) error {
if runtime.GOOS == "windows" {
logrus.Warnf("mounts order validation not yet implemented for OS %q", runtime.GOOS)
return nil
}

mountInfos, err := mount.GetMounts()
if err != nil {
return err
}

type mountOrder struct {
Order int
Root string
Dest string
Source string
}
mountsMap := make(map[string][]mountOrder)
for i, mountInfo := range mountInfos {
m := mountOrder{
Order: i,
Root: mountInfo.Root,
Dest: mountInfo.Mountpoint,
Source: mountInfo.Source,
}
mountsMap[mountInfo.Mountpoint] = append(mountsMap[mountInfo.Mountpoint], m)
}
current := -1
for i, configMount := range spec.Mounts {
mounts := mountsMap[configMount.Destination]
if len(mounts) == 0 {
return fmt.Errorf("Mounts[%d] %s is not mounted in order", i, configMount.Destination)
}
for j, mount := range mounts {
source := mount.Source
for _, option := range configMount.Options {
if option == "bind" || option == "rbind" {
source = mount.Root
break
if j > 0 {
for k, sysMount := range mountInfos[:j-1] {
if _, ok := consumedSys[k]; ok {
continue
}
if err := mountMatch(configMount, sysMount); err == nil {
found = true
break
}
}
}
if source == configMount.Source {
if current > mount.Order {
return fmt.Errorf("Mounts[%d] %s is not mounted in order", i, configMount.Destination)
}
current = mount.Order
// in order to deal with dup mount elements
mountsMap[configMount.Destination] = append(mountsMap[configMount.Destination][:j], mountsMap[configMount.Destination][j+1:]...)
break
if found {
mountErrs = multierror.Append(
mountErrs,
fmt.Errorf(
"mounts[%d] %v mounted before mounts[%d] %v",
i,
configMount,
highestMatchedConfig,
spec.Mounts[highestMatchedConfig]))
} else {
mountErrs = multierror.Append(mountErrs, fmt.Errorf("mounts[%d] %v does not exist", i, configMount))
}
}
}

return nil
return mountErrs
}

func run(context *cli.Context) error {
Expand Down Expand Up @@ -711,13 +689,9 @@ func run(context *cli.Context) error {
description: "hostname",
},
{
test: validateMountsExist,
test: validateMounts,
description: "mounts",
},
{
test: validateMountsOrder,
description: "mounts order",
},
}

linuxValidations := []validation{
Expand Down