Merge pull request #6105 from crazy-max/max-parallelism-flag

buildkitd: add flag to set max parallelism

Author: tonistiigi

cmd/buildkitd/main_containerd_worker.go

@@ -124,6 +124,11 @@ func init() {
 			Name:  "containerd-worker-selinux",
 			Usage: "apply SELinux labels",
 		},
+		cli.IntFlag{
+			Name:  "containerd-max-parallelism",
+			Usage: "limit the number of parallel build steps that can run at the same time",
+			Value: defaultConf.Workers.Containerd.MaxParallelism,
+		},
 	}
 	n := "containerd-worker-rootless"
 	u := "enable rootless mode"
@@ -258,6 +263,9 @@ func applyContainerdFlags(c *cli.Context, cfg *config.Config) error {
 	if c.GlobalIsSet("containerd-worker-selinux") {
 		cfg.Workers.Containerd.SELinux = c.GlobalBool("containerd-worker-selinux")
 	}
+	if c.GlobalIsSet("containerd-max-parallelism") {
+		cfg.Workers.Containerd.MaxParallelism = c.GlobalInt("containerd-max-parallelism")
+	}
 
 	return nil
 }

cmd/buildkitd/main_oci_worker.go

@@ -121,6 +121,11 @@ func init() {
 			Name:  "oci-worker-selinux",
 			Usage: "apply SELinux labels",
 		},
+		cli.IntFlag{
+			Name:  "oci-max-parallelism",
+			Usage: "limit the number of parallel build steps that can run at the same time",
+			Value: defaultConf.Workers.OCI.MaxParallelism,
+		},
 	}
 	n := "oci-worker-rootless"
 	u := "enable rootless mode"
@@ -252,6 +257,9 @@ func applyOCIFlags(c *cli.Context, cfg *config.Config) error {
 	if c.GlobalIsSet("oci-worker-selinux") {
 		cfg.Workers.OCI.SELinux = c.GlobalBool("oci-worker-selinux")
 	}
+	if c.GlobalIsSet("oci-max-parallelism") {
+		cfg.Workers.OCI.MaxParallelism = c.GlobalInt("oci-max-parallelism")
+	}
 
 	return nil
 }

docs/buildkitd.toml.md

@@ -69,7 +69,6 @@ insecure-entitlements = [ "network.host", "security.insecure", "device" ]
   # Whether run subprocesses in main pid namespace or not, this is useful for
   # running rootless buildkit inside a container.
   noProcessSandbox = false
-
   # gc enables/disables garbage collection
   gc = true
   # reservedSpace is the minimum amount of disk space guaranteed to be
@@ -87,7 +86,6 @@ insecure-entitlements = [ "network.host", "security.insecure", "device" ]
   # collector will attempt to leave - however, it will never be bought below
   # reservedSpace.
   minFreeSpace = "20GB"
-
   # alternate OCI worker binary name(example 'crun'), by default either 
   # buildkit-runc or runc binary is used
   binary = ""
@@ -116,7 +114,6 @@ insecure-entitlements = [ "network.host", "security.insecure", "device" ]
     # collector will attempt to leave - however, it will never be bought below
     # reservedSpace.
     minFreeSpace = "10GB"
-
     # keepDuration can be an integer number of seconds (e.g. 172800), or a
     # string duration (e.g. "48h")
     keepDuration = "48h"
@@ -148,7 +145,8 @@ insecure-entitlements = [ "network.host", "security.insecure", "device" ]
   # collector will attempt to leave - however, it will never be bought below
   # reservedSpace.
   minFreeSpace = "20GB"
-
+  # limit the number of parallel build steps that can run at the same time
+  max-parallelism = 4
   # maintain a pool of reusable CNI network namespaces to amortize the overhead
   # of allocating and releasing the namespaces
   cniPoolSize = 16
@@ -195,7 +193,6 @@ insecure-entitlements = [ "network.host", "security.insecure", "device" ]
 
 [frontend."gateway.v0"]
   enabled = true
-
   # If allowedRepositories is empty, all gateway sources are allowed.
   # Otherwise, only the listed repositories are allowed as a gateway source.
   # 
@@ -208,5 +205,4 @@ insecure-entitlements = [ "network.host", "security.insecure", "device" ]
 [system]
   # how often buildkit scans for changes in the supported emulated platforms
   platformsCacheMaxAge = "1h"
-
 ```