Merge pull request containerd#1798 from stevvooe/shim-gomaxprocs

crosbymichael · web-flow · commit ca39f76f82a9 · 2017-11-28T09:55:31.000-05:00
cmd/containerd-shim: set GOMAXPROCS to 2
diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go
@@ -60,6 +60,13 @@ func main() {
 	if debugFlag {
 		logrus.SetLevel(logrus.DebugLevel)
 	}
+
+	if os.Getenv("GOMAXPROCS") == "" {
+		// If GOMAXPROCS hasn't been set, we default to a value of 2 to reduce
+		// the number of Go stacks present in the shim.
+		runtime.GOMAXPROCS(2)
+	}
+
 	if err := executeShim(); err != nil {
 		fmt.Fprintf(os.Stderr, "containerd-shim: %s\n", err)
 		os.Exit(1)
