Merge pull request #784 from champtar/time-ns

Add time namespace / TimeOffsets check and helper

Author: kolyshkin

generate/config.go

@@ -66,6 +66,13 @@ func (g *Generator) initConfigLinuxIntelRdt() {
 	}
 }
 
+func (g *Generator) initConfigLinuxTimeOffsets() {
+	g.initConfigLinux()
+	if g.Config.Linux.TimeOffsets == nil {
+		g.Config.Linux.TimeOffsets = map[string]rspec.LinuxTimeOffset{}
+	}
+}
+
 func (g *Generator) initConfigLinuxSysctl() {
 	g.initConfigLinux()
 	if g.Config.Linux.Sysctl == nil {

generate/generate.go

@@ -17,7 +17,7 @@ import (
 
 var (
 	// Namespaces include the names of supported namespaces.
-	Namespaces = []string{"network", "pid", "mount", "ipc", "uts", "user", "cgroup"}
+	Namespaces = []string{"network", "pid", "mount", "ipc", "uts", "user", "cgroup", "time"}
 
 	// we don't care about order...and this is way faster...
 	removeFunc = func(s []string, i int) []string {
@@ -633,6 +633,12 @@ func (g *Generator) SetLinuxIntelRdtL3CacheSchema(schema string) {
 	g.Config.Linux.IntelRdt.L3CacheSchema = schema
 }
 
+// SetLinuxTimeOffset sets g.Config.Linux.TimeOffsets[clock]
+func (g *Generator) SetLinuxTimeOffset(clock string, offset rspec.LinuxTimeOffset) {
+	g.initConfigLinuxTimeOffsets()
+	g.Config.Linux.TimeOffsets[clock] = offset
+}
+
 // SetLinuxMountLabel sets g.Config.Linux.MountLabel.
 func (g *Generator) SetLinuxMountLabel(label string) {
 	g.initConfigLinux()
@@ -1485,6 +1491,8 @@ func mapStrToNamespace(ns string, path string) (rspec.LinuxNamespace, error) {
 		return rspec.LinuxNamespace{Type: rspec.UserNamespace, Path: path}, nil
 	case "cgroup":
 		return rspec.LinuxNamespace{Type: rspec.CgroupNamespace, Path: path}, nil
+	case "time":
+		return rspec.LinuxNamespace{Type: rspec.TimeNamespace, Path: path}, nil
 	default:
 		return rspec.LinuxNamespace{}, fmt.Errorf("unrecognized namespace %q", ns)
 	}

validate/validate_linux.go

@@ -53,6 +53,7 @@ func (v *Validator) CheckLinux() (errs error) {
 		rspec.UTSNamespace:     {0, false},
 		rspec.UserNamespace:    {0, false},
 		rspec.CgroupNamespace:  {0, false},
+		rspec.TimeNamespace:    {0, false},
 	}
 
 	for index := 0; index < len(v.spec.Linux.Namespaces); index++ {
@@ -92,6 +93,10 @@ func (v *Validator) CheckLinux() (errs error) {
 		errs = multierror.Append(errs, fmt.Errorf("on Linux, hostname requires a new UTS namespace to be specified as well"))
 	}
 
+	if !nsTypeList[rspec.TimeNamespace].newExist && len(v.spec.Linux.TimeOffsets) > 0 {
+		errs = multierror.Append(errs, fmt.Errorf("TimeOffsets requires a new time namespace to be specified as well"))
+	}
+
 	// Linux devices validation
 	devList := make(map[string]bool)
 	devTypeList := make(map[string]bool)