issue-24: added build and exec jail timeouts

briandowns · Jan 4, 2018 · 8ab0847 · 8ab0847
1 parent c998e6d
commit 8ab0847
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/config/config.go b/config/config.go
@@ -34,6 +34,8 @@ type Jails struct {
 	CachePurgeAfter        string `json:"cache_purge_after"`
 	ChildrenMax            int    `json:"children_max"`
 	MonitoringAddr         string `json:"monitoring_addr"`
+	BuildTimeout           string `json:"build_timeout"`
+	ExecTimeout            string `json:"exec_timeout"`
 }
 
 // Config contains the parameters necessary to run sky-island

diff --git a/example-config.json b/example-config.json
@@ -27,6 +27,8 @@
         "cache_default_expiration": "8h",
         "cache_purge_after": "24h",
         "children_max": 0,
-        "monitoring_addr": "127.0.0.1"
+        "monitoring_addr": "127.0.0.1",
+        "build_timeout": "10s",
+        "exec_timeout": "5s"
     }
 }
diff --git a/handlers/function.go b/handlers/function.go
@@ -74,7 +74,7 @@ func (h *handler) build(id, url, call string) ([]byte, error) {
 		return nil, err
 	}
 	buildCommand := []string{jailGoBin, "build", "-o", "/tmp/" + id, "-v", url + "/cmd"}
-	fullBuildArgs := []string{"-c", "-n", id, "ip4=disable", "path=" + h.conf.Jails.BaseJailDir + "/build", "host.hostname=build", "mount.devfs"}
+	fullBuildArgs := []string{"-c", "-n", id, "ip4=disable", "exec.timeout" + h.conf.Jails.BuildTimeout, "path=" + h.conf.Jails.BaseJailDir + "/build", "host.hostname=build", "mount.devfs"}
 	fullBuildArgs = append(fullBuildArgs, buildCommand...)
 	buildCmd := exec.Command("jail", fullBuildArgs...)
 	return buildCmd.CombinedOutput()
@@ -87,7 +87,7 @@ func (h *handler) execute(id, binPath string, ip4 bool) ([]byte, error) {
 		return nil, err
 	}
 	cm := strconv.Itoa(h.conf.Jails.ChildrenMax)
-	funcExecArgs := []string{"-c", "-n", id, "children.max=" + cm, "path=" + h.conf.Jails.BaseJailDir + "/" + id, "host.hostname=" + id, "mount.devfs"}
+	funcExecArgs := []string{"-c", "-n", id, "children.max=" + cm, "exec.timeout" + h.conf.Jails.ExecTimeout, "path=" + h.conf.Jails.BaseJailDir + "/" + id, "host.hostname=" + id, "mount.devfs"}
 	if ip4 {
 		ip, err := h.networksvc.Allocate([]byte(id))
 		if err != nil {